diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp
index bce65d08148..4f7ca301fb7 100644
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@ -78,7 +78,7 @@ static int validate_enum_value(int value, int num_values, int default_value)
 }
 
 template<typename NodeType>
-static InterpolationType get_image_interpolation(NodeType b_node)
+static InterpolationType get_image_interpolation(NodeType& b_node)
 {
 	int value = b_node.interpolation();
 	return (InterpolationType)validate_enum_value(value,
@@ -87,7 +87,7 @@ static InterpolationType get_image_interpolation(NodeType b_node)
 }
 
 template<typename NodeType>
-static ExtensionType get_image_extension(NodeType b_node)
+static ExtensionType get_image_extension(NodeType& b_node)
 {
 	int value = b_node.extension();
 	return (ExtensionType)validate_enum_value(value,
diff --git a/intern/cycles/util/util_aligned_malloc.cpp b/intern/cycles/util/util_aligned_malloc.cpp
index b161a55c15e..15d2eb3271b 100644
--- a/intern/cycles/util/util_aligned_malloc.cpp
+++ b/intern/cycles/util/util_aligned_malloc.cpp
@@ -44,8 +44,7 @@ void *util_aligned_malloc(size_t size, int alignment)
 {
 #ifdef WITH_BLENDER_GUARDEDALLOC
 	return MEM_mallocN_aligned(size, alignment, "Cycles Aligned Alloc");
-#endif
-#ifdef _WIN32
+#elif defined(_WIN32)
 	return _aligned_malloc(size, alignment);
 #elif defined(__APPLE__)
 	/* On Mac OS X, both the heap and the stack are guaranteed 16-byte aligned so
diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp
index db3891e9ea0..389bb4608c5 100644
--- a/intern/cycles/util/util_path.cpp
+++ b/intern/cycles/util/util_path.cpp
@@ -178,7 +178,8 @@ public:
 	class path_info {
 	public:
 		path_info(const string& path)
-		: path_(path)
+		: path_(path),
+		  entry_(NULL)
 		{
 		}