diff --git a/irc/ArchBlackmann/File.cpp b/irc/ArchBlackmann/File.cpp
index d6faf5d57f9..a9fc94ed158 100644
--- a/irc/ArchBlackmann/File.cpp
+++ b/irc/ArchBlackmann/File.cpp
@@ -14,8 +14,8 @@
 #define nelem(x) (  sizeof(x) / sizeof(x[0])  )
 #endif//nelem
 
-using File::filesize_t;
-using File::fileoff_t;
+typedef File::filesize_t filesize_t;
+typedef File::fileoff_t fileoff_t;
 
 
 fileoff_t File::seek ( fileoff_t offset )
diff --git a/irc/ArchBlackmann/File.h b/irc/ArchBlackmann/File.h
index a3ab5c1c141..a5baea62515 100644
--- a/irc/ArchBlackmann/File.h
+++ b/irc/ArchBlackmann/File.h
@@ -18,7 +18,7 @@
 class File
 {
 public:
-#ifdef _MSC_VER
+#ifdef WIN32
 	typedef __int64 fileoff_t;
 	typedef unsigned __int64 filesize_t;
 #else//_MSC_VER
diff --git a/irc/ArchBlackmann/auto_vector.h b/irc/ArchBlackmann/auto_vector.h
index cc07bb42472..730c6302af8 100644
--- a/irc/ArchBlackmann/auto_vector.h
+++ b/irc/ArchBlackmann/auto_vector.h
@@ -53,7 +53,7 @@ public:
 	{
 		ASSERT ( i < _end );
 		reserve ( i + 1 );
-		_arr[i].reset ( ptr );
+		_arr[i].reset ( p );
 	}
 
 	void push_back ( auto_ptr<T>& p )
diff --git a/irc/ArchBlackmann/ssprintf.cpp b/irc/ArchBlackmann/ssprintf.cpp
index 88b829b88d1..9f55d12f637 100644
--- a/irc/ArchBlackmann/ssprintf.cpp
+++ b/irc/ArchBlackmann/ssprintf.cpp
@@ -551,7 +551,7 @@ static bool numberfl(std::string& f, long double __n, char exp_sign,  int size,
 	return true;
 }
 
-static int string(std::string& f, const char* s, int len, int field_width, int precision, int flags)
+static int stringa(std::string& f, const char* s, int len, int field_width, int precision, int flags)
 {
 	int i, done = 0;
 	if (s == NULL)
@@ -654,7 +654,7 @@ std::string ssvprintf ( const char *fmt, va_list args )
 	long double _ldouble;
 	double _double;
 	const char *s;
-	const unsigned short* sw;
+	const wchar_t* sw;
 	int result;
 	std::string f;
 
@@ -793,12 +793,12 @@ std::string ssvprintf ( const char *fmt, va_list args )
 		case 's':
 			if (qualifier == 'l' || qualifier == 'w') {
 				/* print unicode string */
-				sw = va_arg(args, wchar_t *);
+				sw = (const wchar_t*)va_arg(args, wchar_t *);
 				result = stringw(f, sw, -1, field_width, precision, flags);
 			} else {
 				/* print ascii string */
 				s = va_arg(args, char *);
-				result = string(f, s, -1, field_width, precision, flags);
+				result = stringa(f, s, -1, field_width, precision, flags);
 			}
 			if (result < 0)
 			{
@@ -811,10 +811,10 @@ std::string ssvprintf ( const char *fmt, va_list args )
 			if (qualifier == 'h') {
 				/* print ascii string */
 				s = va_arg(args, char *);
-				result = string(f, s, -1, field_width, precision, flags);
+				result = stringa(f, s, -1, field_width, precision, flags);
 			} else {
 				/* print unicode string */
-				sw = va_arg(args, wchar_t *);
+				sw = (const wchar_t*)va_arg(args, wchar_t *);
 				result = stringw(f, sw, -1, field_width, precision, flags);
 			}
 			if (result < 0)
@@ -846,7 +846,7 @@ std::string ssvprintf ( const char *fmt, va_list args )
 					s = pas->Buffer;
 					len = pas->Length;
 				}
-				result = string(f, s, -1, field_width, precision, flags);
+				result = stringa(f, s, -1, field_width, precision, flags);
 			}
 			if (result < 0)
 				return -1;