diff --git a/sprout/algorithm/fixed/make_heap.hpp b/sprout/algorithm/fixed/make_heap.hpp
index c27451ab..16061019 100644
--- a/sprout/algorithm/fixed/make_heap.hpp
+++ b/sprout/algorithm/fixed/make_heap.hpp
@@ -1,5 +1,5 @@
-#ifndef SPROUT_ALGORITHM_FIXED_POP_HEAP_HPP
-#define SPROUT_ALGORITHM_FIXED_POP_HEAP_HPP
+#ifndef SPROUT_ALGORITHM_FIXED_MAKE_HEAP_HPP
+#define SPROUT_ALGORITHM_FIXED_MAKE_HEAP_HPP
 
 #include <sprout/config.hpp>
 #include <sprout/fixed_container/traits.hpp>
@@ -119,4 +119,4 @@ namespace sprout {
 	}	// namespace fixed
 }	// namespace sprout
 
-#endif	// #ifndef SPROUT_ALGORITHM_FIXED_POP_HEAP_HPP
+#endif	// #ifndef SPROUT_ALGORITHM_FIXED_MAKE_HEAP_HPP
diff --git a/sprout/algorithm/fixed/make_partial_heap.hpp b/sprout/algorithm/fixed/make_partial_heap.hpp
index d17d7e3d..5d63dae6 100644
--- a/sprout/algorithm/fixed/make_partial_heap.hpp
+++ b/sprout/algorithm/fixed/make_partial_heap.hpp
@@ -52,7 +52,7 @@ namespace sprout {
 				)
 			{
 				return sprout::fixed::detail::make_partial_heap_impl_1(
-					sprout::fixed::detail::make_heap_impl(cont, comp, offset, middle_size),
+                                 ::sprout::fixed::detail::make_heap_impl(cont, comp, offset, middle_size),
 					comp,
 					offset,
 					size,
diff --git a/sprout/fixed_container/fixed_size.hpp b/sprout/fixed_container/fixed_size.hpp
index 9bbd190b..f40072f0 100644
--- a/sprout/fixed_container/fixed_size.hpp
+++ b/sprout/fixed_container/fixed_size.hpp
@@ -12,7 +12,7 @@ namespace sprout {
 	template<typename Container>
 	struct fixed_size {
 	public:
-		typedef typename sprout::fixed_container_traits<Container>::size_type value
+		static SPROUT_CONSTEXPR typename sprout::fixed_container_traits<Container>::size_type value
 			= sprout::fixed_container_traits<Container>::fixed_size
 			;
 		typedef std::integral_constant<typename sprout::fixed_container_traits<Container>::size_type, value> type;
diff --git a/sprout/range/algorithm/fixed/transform.hpp b/sprout/range/algorithm/fixed/transform.hpp
index a1be4838..f9ea2cc0 100644
--- a/sprout/range/algorithm/fixed/transform.hpp
+++ b/sprout/range/algorithm/fixed/transform.hpp
@@ -20,7 +20,7 @@ namespace sprout {
 				UnaryOperation op
 				)
 			{
-				return sprout::fixed::transform(sprout::begin(input), sprout::end(input), result, op));
+				return sprout::fixed::transform(sprout::begin(input), sprout::end(input), result, op);
 			}
 
 			//
diff --git a/sprout/range/algorithm/infit/transform.hpp b/sprout/range/algorithm/infit/transform.hpp
index 386fa0c8..4dfd2315 100644
--- a/sprout/range/algorithm/infit/transform.hpp
+++ b/sprout/range/algorithm/infit/transform.hpp
@@ -20,7 +20,7 @@ namespace sprout {
 				UnaryOperation op
 				)
 			{
-				return sprout::infit::transform(sprout::begin(input), sprout::end(input), result, op));
+				return sprout::infit::transform(sprout::begin(input), sprout::end(input), result, op);
 			}
 
 			//
diff --git a/sprout/range/algorithm/outfit/transform.hpp b/sprout/range/algorithm/outfit/transform.hpp
index 0ae30e97..e9cbb4d8 100644
--- a/sprout/range/algorithm/outfit/transform.hpp
+++ b/sprout/range/algorithm/outfit/transform.hpp
@@ -20,7 +20,7 @@ namespace sprout {
 				UnaryOperation op
 				)
 			{
-				return sprout::outfit::transform(sprout::begin(input), sprout::end(input), result, op));
+				return sprout::outfit::transform(sprout::begin(input), sprout::end(input), result, op);
 			}
 
 			//