diff --git a/src/gui/control/card_list_column_select.cpp b/src/gui/control/card_list_column_select.cpp
index 0fd7bcd2..c15a4c62 100644
--- a/src/gui/control/card_list_column_select.cpp
+++ b/src/gui/control/card_list_column_select.cpp
@@ -79,7 +79,7 @@ void CardListColumnSelectDialog::initList() {
 		// check
 		int i = list->GetCount() - 1;
 		list->Check(i, c.settings.visible);
-		#ifdef _WX_MSW_
+		#ifdef __WXMSW__
 			// fix the background color
 			list->GetItem(i)->SetBackgroundColour(window_color);
 		#endif
diff --git a/src/gui/value/editor.hpp b/src/gui/value/editor.hpp
index 3229ab11..c37b9559 100644
--- a/src/gui/value/editor.hpp
+++ b/src/gui/value/editor.hpp
@@ -31,7 +31,7 @@
  */
 class ValueEditor {
   public:
-	virtual ~ValueEditor();
+	virtual ~ValueEditor() {}
 	// --------------------------------------------------- : Events
 	
 	/// This editor gains focus
diff --git a/src/mse.vcproj b/src/mse.vcproj
index fd7f2b8e..8220f3c3 100644
--- a/src/mse.vcproj
+++ b/src/mse.vcproj
@@ -1178,7 +1178,7 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
 			<File
-				RelativePath=".\resource\mse.rc">
+				RelativePath=".\resource\msw\mse.rc">
 			</File>
 		</Filter>
 		<Filter
@@ -1627,6 +1627,9 @@
 		<Filter
 			Name="util"
 			Filter="">
+			<File
+				RelativePath=".\util\atomic.hpp">
+			</File>
 			<File
 				RelativePath=".\util\dynamic_arg.hpp">
 			</File>
diff --git a/src/script/value.hpp b/src/script/value.hpp
index e5c0c450..9f4e9b16 100644
--- a/src/script/value.hpp
+++ b/src/script/value.hpp
@@ -37,11 +37,6 @@ enum ScriptType
 /// Actual values are derived types
 class ScriptValue : public IntrusivePtrBase {
   public:
-	inline ScriptValue()
-		#ifdef USE_INTRUSIVE_PTR
-			 : refCount(0)
-		#endif
-	{}
 	virtual ~ScriptValue() {}
 	
 	/// Information on the type of this value
diff --git a/src/util/error.hpp b/src/util/error.hpp
index 422539d2..630b48ca 100644
--- a/src/util/error.hpp
+++ b/src/util/error.hpp
@@ -52,7 +52,7 @@ class PackageError : public Error {
 class FileNotFoundError : public PackageError {
   public:
 	inline FileNotFoundError(const String& file, const String& package)
-		: PackageError(_ERROR_2_("file not found", file.c_str(), package.c_str()))
+		: PackageError(_ERROR_2_("file not found", file, package))
 	{}
 };
 
@@ -68,7 +68,7 @@ class ParseError : public Error {
 class FileParseError : public ParseError {
   public:
 	inline FileParseError(const String& err, const String& file) :
-		ParseError(_ERROR_2_("file parse error", file.c_str(), err.c_str()))
+		ParseError(_ERROR_2_("file parse error", file, err))
 	{}
 };
 
diff --git a/src/util/io/get_member.hpp b/src/util/io/get_member.hpp
index 62004a71..cca09d2f 100644
--- a/src/util/io/get_member.hpp
+++ b/src/util/io/get_member.hpp
@@ -10,11 +10,10 @@
 // ----------------------------------------------------------------------------- : Includes
 
 #include <util/prec.hpp>
+#include <script/value.hpp>
 
 DECLARE_INTRUSIVE_POINTER_TYPE(ScriptValue);
 DECLARE_INTRUSIVE_POINTER_TYPE(Script);
-inline void intrusive_ptr_add_ref(ScriptValue* p);
-inline void intrusive_ptr_release(ScriptValue* p);
 
 template <typename T> class Defaultable;
 template <typename T> class Scriptable;
diff --git a/src/util/locale.hpp b/src/util/locale.hpp
index f80e541f..ebafd1d3 100644
--- a/src/util/locale.hpp
+++ b/src/util/locale.hpp
@@ -79,10 +79,10 @@ inline String format_string(const String& format, ...) {
 	va_end(args);
 }
 inline String format_string(const String& format, const String& a0) {
-	return format_string(format, a0.c_str());
+	return String::Format(format, a0.c_str());
 }
 inline String format_string(const String& format, const String& a0, const String& a1) {
-	return format_string(format, a0.c_str(), a1.c_str());
+	return String::Format(format, a0.c_str(), a1.c_str());
 }
 
 // ----------------------------------------------------------------------------- : EOF
diff --git a/src/util/smart_ptr.hpp b/src/util/smart_ptr.hpp
index 198e97f2..98db5295 100644
--- a/src/util/smart_ptr.hpp
+++ b/src/util/smart_ptr.hpp
@@ -105,14 +105,15 @@ inline shared_ptr<T> new_shared7(const A0& a0, const A1& a1, const A2& a2, const
 	/// Base class for objects wishing to use intrusive_ptrs
 	class IntrusivePtrBase {
 	  public:
-		virtual ~IntrusivePtrBase();
+		inline IntrusivePtrBase() : ref_count(0) {}
+		virtual ~IntrusivePtrBase() {}
 	  protected:
 		/// Delete this object
 		virtual void destroy() {
 			delete this;
 		}
 	  private:
-		volatile AtomicInt ref_count;
+		AtomicInt ref_count;
 		friend void intrusive_ptr_add_ref(IntrusivePtrBase*);
 		friend void intrusive_ptr_release(IntrusivePtrBase*);
 	};