diff --git a/MySQLPlugin.cpp b/MySQLPlugin.cpp
index 5386ee1..ecbe133 100644
--- a/MySQLPlugin.cpp
+++ b/MySQLPlugin.cpp
@@ -377,7 +377,7 @@ void CMySQLPlugin::OnScript_Fetch_Row()
             else
                 Plugin_Scr_AddString(row[i]);
                 
-            Plugin_Scr_AddArrayKey(Plugin_Scr_AllocString(field->name));
+            Plugin_Scr_AddArrayKeys(Plugin_Scr_AllocString(field->name));
         }
     }
 }
@@ -429,7 +429,7 @@ void CMySQLPlugin::OnScript_Fetch_Rows()
         for (unsigned int i = 0; i < col_count; ++i)
         {
             Plugin_Scr_AddString(rows[i]);
-            Plugin_Scr_AddArrayKey(keyArrayIndex[i]);
+            Plugin_Scr_AddArrayKeys(keyArrayIndex[i]);
         }
         Plugin_Scr_AddArray();
     }
diff --git a/makefile b/makefile
index 19ece38..8924ba2 100644
--- a/makefile
+++ b/makefile
@@ -33,7 +33,7 @@ OBJECTS=$(C_OBJECTS) $(CPP_OBJECTS)
 
 TARGET_OS = $(shell $(CC) -dumpmachine)
 
-ifeq      ($(TARGET_OS),mingw32)
+ifeq ($(OS),Windows_NT)
 INCLUDEDIR=$(INCLUDEDIR_WIN32)
 ADDITIONALLIBS=$(ADDITIONALLIBS_WIN32)
 else ifeq ($(TARGET_OS),cygwin)
@@ -47,7 +47,7 @@ endif
 ############
 # Recipies #
 ############
-ifeq      ($(TARGET_OS),mingw32)
+ifeq ($(OS),Windows_NT)
 all: win32
 else
 all: unix
@@ -59,7 +59,7 @@ obj/%.o: %.cpp
 	@echo $(CC)    "$^ -> $@"
 	@$(CC) $(CFLAGS) $(INCLUDEDIR) -o $@ -c $<
 
-ifeq      ($(TARGET_OS),mingw32)
+ifeq ($(OS),Windows_NT)
 clean: clean_win32
 else
 clean: clean_unix
@@ -74,7 +74,8 @@ win32: bin/lib$(PLUGIN_NAME).dll
 
 bin/lib$(PLUGIN_NAME).dll: $(OBJECTS)
 	@echo $(CC)    "$@"
-	@$(CC) -shared $(CFLAGS) -o $@ $^ ../libcom_plugin.a $(ADDITIONALLIBS)
+	@echo here
+	@$(CC) -shared $(CFLAGS) -o $@ $^ -L.. -lcom_plugin $(ADDITIONALLIBS)
 
 clean_win32:
 	@del $(subst /,\\,$(OBJECTS))