diff --git a/SConstruct b/SConstruct
index e93aad96a8..fcc5382e92 100644
--- a/SConstruct
+++ b/SConstruct
@@ -454,6 +454,9 @@ conf = Configure (libraries['flac'])
 conf.CheckLib ('FLAC', 'FLAC__stream_decoder_new', language='CXX')
 libraries['flac'] = conf.Finish ()
 
+# or if that fails...
+#libraries['flac']    = LibraryInfo (LIBS='FLAC')
+
 #
 # Check for liblo
 
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h
index c4032b9ed9..bfd3e429c3 100644
--- a/libs/ardour/ardour/tempo.h
+++ b/libs/ardour/ardour/tempo.h
@@ -238,7 +238,7 @@ class TempoMap : public Stateful, public StateManager {
 
 	XMLNode& get_state (void);
 	int set_state (const XMLNode&);
-        PBD::ID id();
+        PBD::ID id() { return _id; }
 
 	void dump (std::ostream&) const;
 	void clear ();