diff --git a/include/common/qvec.hh b/include/common/qvec.hh
index 1b438cb5..c0abd81e 100644
--- a/include/common/qvec.hh
+++ b/include/common/qvec.hh
@@ -621,14 +621,6 @@ template<typename T>
     return normal;
 }
 
-template<typename T>
-inline qvec<T, 3> vec_from_mangle(const qvec<T, 3> &m)
-{
-    const qvec<T, 3> mRadians = m * static_cast<T>(Q_PI / 180.0);
-    const qmat3x3d rotations = RotateAboutZ(mRadians[0]) * RotateAboutY(-mRadians[1]);
-    return {rotations * qvec3d(1, 0, 0)};
-}
-
 template<typename T>
 inline qvec<T, 3> mangle_from_vec(const qvec<T, 3> &v)
 {
@@ -1146,4 +1138,16 @@ struct twosided
     // equality checks
     constexpr bool operator==(const twosided &other) const { return front == other.front && back == other.back; }
     constexpr bool operator!=(const twosided &other) const { return !(*this == other); }
-};
\ No newline at end of file
+};
+
+namespace qv {
+
+template<typename T>
+inline qvec<T, 3> vec_from_mangle(const qvec<T, 3> &m)
+{
+    const qvec<T, 3> mRadians = m * static_cast<T>(Q_PI / 180.0);
+    const qmat3x3d rotations = RotateAboutZ(mRadians[0]) * RotateAboutY(-mRadians[1]);
+    return {rotations * qvec3d(1, 0, 0)};
+}
+
+}
diff --git a/include/common/settings.hh b/include/common/settings.hh
index 6dbb3b43..963a64a3 100644
--- a/include/common/settings.hh
+++ b/include/common/settings.hh
@@ -43,7 +43,7 @@ private:
 public:
     parse_exception(std::string str) : _what(std::move(str)) { }
 
-    const char *what() const override { return _what.c_str(); }
+    const char *what() const noexcept override { return _what.c_str(); }
 };
 
 enum class source