diff --git a/include/common/bspfile.hh b/include/common/bspfile.hh
index af3a71ff..a8101b6d 100644
--- a/include/common/bspfile.hh
+++ b/include/common/bspfile.hh
@@ -182,10 +182,10 @@ constexpr ADest array_cast(const ASrc &src, const char *overflow_message = "src"
     ADest dest{};
 
     for (size_t i = 0; i < std::min(dest.size(), src.size()); i++) {
-        if constexpr (std::is_arithmetic_v<ADest::value_type> && std::is_arithmetic_v<ASrc::value_type>)
-            dest[i] = numeric_cast<ADest::value_type>(src[i], overflow_message);
+        if constexpr (std::is_arithmetic_v<typename ADest::value_type> && std::is_arithmetic_v<typename ASrc::value_type>)
+            dest[i] = numeric_cast<typename ADest::value_type>(src[i], overflow_message);
         else
-            dest[i] = static_cast<ADest::value_type>(src[i]);
+            dest[i] = static_cast<typename ADest::value_type>(src[i]);
     }
 
     return dest;
diff --git a/include/common/cmdlib.hh b/include/common/cmdlib.hh
index 338c72fb..aa0aaab0 100644
--- a/include/common/cmdlib.hh
+++ b/include/common/cmdlib.hh
@@ -120,11 +120,9 @@ template<typename... Args>
 }
 
 #ifdef _MSC_VER
-#define FError(fmt, ...) Error("{}: " fmt, __func__, __VA_ARGS__)
+#define FError(fmt, ...) Error("{}: " fmt, __func__, ##__VA_ARGS__)
 #else
-#define VA_ARGS(...) , ##__VA_ARGS__
-#define FError(fmt, ...) Error("{}: " fmt, __func__ VA_ARGS(__VA_ARGS__))
-#undef VA_ARGS
+#define FError(fmt, ...) Error("{}: " fmt, __func__, ##__VA_ARGS__)
 #endif
 
 using qfile_t = std::unique_ptr<FILE, decltype(&fclose)>;
diff --git a/include/common/log.hh b/include/common/log.hh
index 593dd4b2..78b240d5 100644
--- a/include/common/log.hh
+++ b/include/common/log.hh
@@ -83,11 +83,9 @@ inline void LogPrint(const char *fmt, const Args &...args)
 }
 
 #ifdef _MSC_VER
-#define FLogPrint(fmt, ...) LogPrint("{}: " fmt, __func__, __VA_ARGS__)
+#define FLogPrint(fmt, ...) LogPrint("{}: " fmt, __func__, ##__VA_ARGS__)
 #else
-#define VA_ARGS(...) , ##__VA_ARGS__
-#define FLogPrint(fmt, ...) LogPrint("{}: " fmt, __func__ VA_ARGS(__VA_ARGS__))
-#undef VA_ARGS
+#define FLogPrint(fmt, ...) LogPrint("{}: " fmt, __func__, ##__VA_ARGS__)
 #endif
 
 /* Print only into log file */
diff --git a/include/common/polylib.hh b/include/common/polylib.hh
index 6b552faa..bc204ab0 100644
--- a/include/common/polylib.hh
+++ b/include/common/polylib.hh
@@ -528,7 +528,7 @@ public:
             plane_t &dest = result[i];
 
             const qvec3d &v0 = at(i);
-            const qvec3d &v1 = get((i + 1) % count);
+            const qvec3d &v1 = at((i + 1) % count);
 
             qvec3d edgevec = qv::normalize(v1 - v0);
             qvec3d normal = qv::cross(edgevec, p.normal);