diff --git a/arbor/util/unwind.cpp b/arbor/util/unwind.cpp
index 5303c9024dc4d205b874e6994aeb27b51cffc7f7..4e0e1cb9dceffc0df115be538f795744fe170750 100644
--- a/arbor/util/unwind.cpp
+++ b/arbor/util/unwind.cpp
@@ -73,6 +73,7 @@ std::ostream& operator<<(std::ostream& out, const backtrace& trace) {
             break;
         }
     }
+    return out;
 }
 
 #if 0
diff --git a/modcc/printer/cprinter.cpp b/modcc/printer/cprinter.cpp
index accb25a36cd8eadf2969432bb676617d79c1ee54..16f96ea74f819f8f8223790c9266e7d67a727ce2 100644
--- a/modcc/printer/cprinter.cpp
+++ b/modcc/printer/cprinter.cpp
@@ -171,7 +171,7 @@ std::string emit_cpp_source(const Module& module_, const printer_options& opt) {
             "static constexpr unsigned simd_width_ = ";
 
         if (!opt.simd.width) {
-            out << "S::simd_abi::native_width<fvm_value_type>::value;\n";
+            out << "S::simd_abi::native_width<::arb::fvm_value_type>::value;\n";
         }
         else {
             out << opt.simd.width << ";\n";
@@ -188,8 +188,8 @@ std::string emit_cpp_source(const Module& module_, const printer_options& opt) {
         }
 
         out <<
-            "using simd_value = S::simd<fvm_value_type, simd_width_, " << abi << ">;\n"
-            "using simd_index = S::simd<fvm_index_type, simd_width_, " << abi << ">;\n"
+            "using simd_value = S::simd<::arb::fvm_value_type, simd_width_, " << abi << ">;\n"
+            "using simd_index = S::simd<::arb::fvm_index_type, simd_width_, " << abi << ">;\n"
             "\n";
     }