fixed multiple possible issues in all compilers
+
+