diff --git a/sprout/math/equal_to.hpp b/sprout/math/equal_to.hpp
index a3e4efe0..2175aeae 100644
--- a/sprout/math/equal_to.hpp
+++ b/sprout/math/equal_to.hpp
@@ -5,7 +5,7 @@
 #include <type_traits>
 #include <sprout/config.hpp>
 #include <sprout/algorithm/max.hpp>
-#include <sprout/math/abs.hpp>
+#include <sprout/math/fabs.hpp>
 #include <sprout/type_traits/arithmetic_promote.hpp>
 #include <sprout/type_traits/enabler_if.hpp>
 
@@ -22,8 +22,8 @@ namespace sprout {
 			inline SPROUT_CONSTEXPR bool
 			equal_to_impl(FloatType x, FloatType y) {
 				return x == y
-					|| sprout::abs(x - y)
-						<= std::numeric_limits<FloatType>::epsilon() * sprout::math::detail::max3(std::abs(x), std::abs(y), FloatType(1.0))
+					|| sprout::fabs(x - y)
+						<= std::numeric_limits<FloatType>::epsilon() * sprout::math::detail::max3(sprout::fabs(x), sprout::fabs(y), FloatType(1))
 					;
 			}
 
diff --git a/sprout/random/uniform_01.hpp b/sprout/random/uniform_01.hpp
index b702003d..6e739c2c 100644
--- a/sprout/random/uniform_01.hpp
+++ b/sprout/random/uniform_01.hpp
@@ -69,7 +69,7 @@ namespace sprout {
 					sprout::random::random_result<Engine, uniform_01>()
 					;
 			}
-			template<int D = 0, typename Engine, SPROUT_RECURSIVE_FUNCTION_TEMPLATE_CONTINUE(D)>
+			template<int D = 2, typename Engine, SPROUT_RECURSIVE_FUNCTION_TEMPLATE_CONTINUE(D)>
 			SPROUT_CONSTEXPR sprout::random::random_result<Engine, uniform_01>
 			generate(Engine const& eng, sprout::random::random_result<Engine> const& rnd) const {
 				typedef typename Engine::result_type base_result;
@@ -85,7 +85,7 @@ namespace sprout {
 						)
 					);
 			}
-			template<int D = 0, typename Engine, SPROUT_RECURSIVE_FUNCTION_TEMPLATE_BREAK(D)>
+			template<int D = 2, typename Engine, SPROUT_RECURSIVE_FUNCTION_TEMPLATE_BREAK(D)>
 			SPROUT_CONSTEXPR sprout::random::random_result<Engine, uniform_01>
 			generate(Engine const& eng, sprout::random::random_result<Engine> const& rnd) const {
 				return throw std::runtime_error(SPROUT_RECURSIVE_FUNCTION_TEMPLATE_INSTANTIATION_EXCEEDED_MESSAGE),