diff --git a/include/mitsuba/core/lrucache.h b/include/mitsuba/core/lrucache.h
index c52e78bf..7e36feed 100644
--- a/include/mitsuba/core/lrucache.h
+++ b/include/mitsuba/core/lrucache.h
@@ -21,20 +21,11 @@
 
 #include <mitsuba/mitsuba.h>
 
-/* push_macro(..) is not supported everywhere :( */
-#undef Float
-
 #include <boost/bimap.hpp>
 #include <boost/bimap/list_of.hpp>
 #include <boost/bimap/set_of.hpp>
 #include <boost/function.hpp>
 
-#ifdef DOUBLE_PRECISION
-#define Float double
-#else
-#define Float float
-#endif
-
 MTS_NAMESPACE_BEGIN
 
 /**
@@ -43,6 +34,23 @@ MTS_NAMESPACE_BEGIN
  * Based on the bimap implementation by Tim Day
  * (http://www.bottlenose.demon.co.uk/article/lru.pdf)
  *
+ * The original code is under the following license:
+ *
+ * <pre>
+ * Copyright (c) 2010, Tim Day <timday@timday.com> 
+ * Permission to use, copy, modify, and/or distribute this software for any 
+ * purpose with or without fee is hereby granted, provided that the above 
+ * copyright notice and this permission notice appear in all copies. 
+ *  
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * </pre>
+ *
  * \tparam K Key data type
  * \tparam KComp Key comparator
  * \tparam V Value data type
diff --git a/include/mitsuba/render/camera.h b/include/mitsuba/render/camera.h
index a0590e1b..8af5ad68 100644
--- a/include/mitsuba/render/camera.h
+++ b/include/mitsuba/render/camera.h
@@ -72,7 +72,7 @@ public:
 	inline Float getShutterOpenTime() const { return m_shutterOpenTime; }
 
 	/// Return the time value of the shutter closing event
-	inline Float getShutterClose() const { return m_shutterOpen; }
+	inline Float getShutterClose() const { return m_shutterClose; }
 
 	//! @}
 	// =============================================================