diff --git a/gst/gstvalue.c b/gst/gstvalue.c
index 60d040ecbb..c1eff57983 100644
--- a/gst/gstvalue.c
+++ b/gst/gstvalue.c
@@ -1295,7 +1295,7 @@ gst_value_deserialize_buffer (GValue * dest, const gchar * s)
     ts[1] = s[i * 2 + 1];
     ts[2] = 0;
 
-    data[i] = strtoul (ts, NULL, 16);
+    data[i] = (guint8) strtoul (ts, NULL, 16);
   }
 
   if (ret) {
@@ -1617,7 +1617,7 @@ gst_value_deserialize_float (GValue * dest, const gchar * s)
   if (x > G_MAXFLOAT || x < -G_MAXFLOAT)
     ret = FALSE;
   if (ret) {
-    g_value_set_float (dest, x);
+    g_value_set_float (dest, (float) x);
   }
   return ret;
 }
@@ -2073,7 +2073,7 @@ gst_value_intersect_double_range_double_range (GValue * dest,
   }
   if (min == max) {
     g_value_init (dest, G_TYPE_DOUBLE);
-    g_value_set_int (dest, min);
+    g_value_set_int (dest, (int) min);
     return TRUE;
   }
 
diff --git a/win32/vs6/grammar.dsp b/win32/vs6/grammar.dsp
index f692d0d95d..20edeb746a 100644
--- a/win32/vs6/grammar.dsp
+++ b/win32/vs6/grammar.dsp
@@ -68,11 +68,19 @@ SOURCE=..\..\gst\parse\grammar.y
 # Begin Custom Build
 InputPath=..\..\gst\parse\grammar.y
 
-"..\..\gst\parse\lex._gst_parse_yy.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	bison -d -v -p_gst_parse__yy ..\..\gst\parse\grammar.y -o ..\..\gst\parse\grammar.tab.c 
-	flex -P_gst_parse_yy ..\..\gst\parse\parse.l 
-	move lex._gst_parse_yy.c ..\..\gst\parse\lex._gst_parse_yy.c 
+BuildCmds= \
+	bison -d -v -p_gst_parse__yy ..\..\gst\parse\grammar.y -o ..\..\gst\parse\grammar.tab.c \
+	flex -P_gst_parse_yy -o..\..\gst\parse\lex._gst_parse_yy.c ..\..\gst\parse\parse.l \
 	
+
+"..\..\gst\parse\lex._gst_parse_yy.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"..\..\gst\parse\grammar.tab.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"..\..\gst\parse\grammar.tab.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "grammar - Win32 Debug"
@@ -80,10 +88,19 @@ InputPath=..\..\gst\parse\grammar.y
 # Begin Custom Build
 InputPath=..\..\gst\parse\grammar.y
 
-"..\..\gst\parse\lex._gst_parse_yy.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	bison -d -v -p_gst_parse__yy ..\..\gst\parse\grammar.y -o ..\..\gst\parse\grammar.tab.c 
-	flex -P_gst_parse_yy -o..\..\gst\parse\lex._gst_parse_yy.c ..\..\gst\parse\parse.l 
+BuildCmds= \
+	bison -d -v -p_gst_parse__yy ..\..\gst\parse\grammar.y -o ..\..\gst\parse\grammar.tab.c \
+	flex -P_gst_parse_yy -o..\..\gst\parse\lex._gst_parse_yy.c ..\..\gst\parse\parse.l \
 	
+
+"..\..\gst\parse\lex._gst_parse_yy.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"..\..\gst\parse\grammar.tab.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"..\..\gst\parse\grammar.tab.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
 # End Custom Build
 
 !ENDIF 
diff --git a/win32/vs6/gst_inspect.dsp b/win32/vs6/gst_inspect.dsp
index dace01bd98..df85784498 100644
--- a/win32/vs6/gst_inspect.dsp
+++ b/win32/vs6/gst_inspect.dsp
@@ -79,11 +79,11 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib intl.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/gst-inspect-0.9.exe" /pdbtype:sept
+# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib gthread-2.0D.lib gmodule-2.0D.lib libxml2.lib wsock32.lib intl.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/gst-inspect-0.9.exe" /pdbtype:sept
 # Begin Special Build Tool
 TargetPath=.\Debug\gst-inspect-0.9.exe
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\bin
+PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\bin
 # End Special Build Tool
 
 !ENDIF 
diff --git a/win32/vs6/gst_launch.dsp b/win32/vs6/gst_launch.dsp
index 76575dd612..89ce2bc59a 100644
--- a/win32/vs6/gst_launch.dsp
+++ b/win32/vs6/gst_launch.dsp
@@ -79,11 +79,11 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib intl.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/gst-launch-0.9.exe" /pdbtype:sept
+# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib gthread-2.0D.lib gmodule-2.0D.lib libxml2.lib wsock32.lib intl.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/gst-launch-0.9.exe" /pdbtype:sept
 # Begin Special Build Tool
 TargetPath=.\Debug\gst-launch-0.9.exe
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\bin
+PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\bin
 # End Special Build Tool
 
 !ENDIF 
diff --git a/win32/vs6/libgstbase.dsp b/win32/vs6/libgstbase.dsp
index 1b3c7f2f48..abd590f1d3 100644
--- a/win32/vs6/libgstbase.dsp
+++ b/win32/vs6/libgstbase.dsp
@@ -84,11 +84,11 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib intl.lib /nologo /dll /debug /machine:I386 /out:"Debug/libgstbase-0.9.dll" /pdbtype:sept
+# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib gthread-2.0D.lib gmodule-2.0D.lib libxml2.lib wsock32.lib intl.lib /nologo /dll /debug /machine:I386 /out:"Debug/libgstbase-0.9.dll" /pdbtype:sept
 # Begin Special Build Tool
 TargetPath=.\Debug\libgstbase-0.9.dll
 SOURCE="$(InputPath)"
-PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\bin
+PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\bin
 # End Special Build Tool
 
 !ENDIF 
diff --git a/win32/vs6/libgstelements.dsp b/win32/vs6/libgstelements.dsp
index 4883ce479b..5bc2f5a108 100644
--- a/win32/vs6/libgstelements.dsp
+++ b/win32/vs6/libgstelements.dsp
@@ -57,7 +57,7 @@ LINK32=link.exe
 # Begin Special Build Tool
 TargetPath=.\Release\libgstelements.dll
 SOURCE="$(InputPath)"
-PostBuild_Cmds=mkdir c:\gstreamer\lib	mkdir c:\gstreamer\lib\gstreamer-0.9	copy /Y $(TargetPath) c:\gstreamer\plugins
+PostBuild_Cmds=mkdir c:\gstreamer\lib	mkdir c:\gstreamer\lib\gstreamer-0.9	copy /Y $(TargetPath) c:\gstreamer\lib\gstreamer-0.9
 # End Special Build Tool
 
 !ELSEIF  "$(CFG)" == "libgstelements - Win32 Debug"
@@ -84,11 +84,11 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib intl.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib gthread-2.0D.lib gmodule-2.0D.lib libxml2.lib wsock32.lib intl.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 # Begin Special Build Tool
 TargetPath=.\Debug\libgstelements.dll
 SOURCE="$(InputPath)"
-PostBuild_Cmds=mkdir c:\gstreamer\lib	mkdir c:\gstreamer\lib\gstreamer-0.9	copy /Y $(TargetPath) c:\gstreamer\plugins
+PostBuild_Cmds=mkdir c:\gstreamer\debug\lib	mkdir c:\gstreamer\debug\lib\gstreamer-0.9	copy /Y $(TargetPath) c:\gstreamer\debug\lib\gstreamer-0.9
 # End Special Build Tool
 
 !ENDIF 
@@ -134,6 +134,10 @@ SOURCE=..\..\plugins\elements\gstidentity.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\plugins\elements\gstqueue.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\plugins\elements\gsttee.c
 # End Source File
 # Begin Source File
diff --git a/win32/vs6/libgstreamer.dsp b/win32/vs6/libgstreamer.dsp
index 415b76616c..c6a162ddd4 100644
--- a/win32/vs6/libgstreamer.dsp
+++ b/win32/vs6/libgstreamer.dsp
@@ -75,7 +75,7 @@ PostBuild_Cmds=mkdir c:\gstreamer	mkdir c:\gstreamer\bin	copy /Y $(TargetPath) c
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTREAMER_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "." /I ".." /I "../.." /I "../common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTREAMER_EXPORTS" /D "HAVE_CONFIG_H" /D "HAVE_WIN32" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /ZI /Od /I "." /I "../.." /I "../common" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTREAMER_EXPORTS" /D "HAVE_CONFIG_H" /D "HAVE_WIN32" /FR /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -86,11 +86,11 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib intl.lib /nologo /dll /debug /machine:I386 /out:"Debug/libgstreamer-0.9.dll" /pdbtype:sept
+# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib gthread-2.0D.lib gmodule-2.0D.lib libxml2.lib wsock32.lib intl.lib /nologo /dll /debug /machine:I386 /out:"Debug/libgstreamer-0.9.dll" /pdbtype:sept
 # Begin Special Build Tool
 TargetPath=.\Debug\libgstreamer-0.9.dll
 SOURCE="$(InputPath)"
-PostBuild_Cmds=mkdir c:\gstreamer	mkdir c:\gstreamer\bin	copy /Y $(TargetPath) c:\gstreamer\bin
+PostBuild_Cmds=mkdir c:\gstreamer\debug	mkdir c:\gstreamer\debug\bin	copy /Y $(TargetPath) c:\gstreamer\debug\bin
 # End Special Build Tool
 
 !ENDIF 
@@ -108,6 +108,10 @@ SOURCE=..\common\dirent.c
 # End Source File
 # Begin Source File
 
+SOURCE="..\..\gst\glib-compat.c"
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\gst\parse\grammar.tab.c
 # End Source File
 # Begin Source File
@@ -196,10 +200,6 @@ SOURCE=..\..\gst\gstmarshal.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\gst\gstmemchunk.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\gst\gstmessage.c
 # End Source File
 # Begin Source File
@@ -240,10 +240,6 @@ SOURCE=..\..\gst\gstquery.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\gst\gstqueue.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\gst\gstregistry.c
 # End Source File
 # Begin Source File
@@ -252,6 +248,10 @@ SOURCE=..\..\gst\gstregistryxml.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\gst\gstsegment.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\gst\gststructure.c
 # End Source File
 # Begin Source File
@@ -276,10 +276,6 @@ SOURCE=..\..\gst\gsttrace.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\gst\gsttrashstack.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\gst\gsttypefind.c
 # End Source File
 # Begin Source File
@@ -292,10 +288,6 @@ SOURCE=..\..\gst\gsturi.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\gst\gsturitype.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\gst\gstutils.c
 # End Source File
 # Begin Source File
@@ -484,11 +476,11 @@ SOURCE=..\..\gst\gstquery.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\gst\gstqueue.h
+SOURCE=..\..\gst\gstregistry.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\gst\gstregistry.h
+SOURCE=..\..\gst\gstsegment.h
 # End Source File
 # Begin Source File
 
@@ -532,10 +524,6 @@ SOURCE=..\..\gst\gsturi.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\gst\gsturitype.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\gst\gstutils.h
 # End Source File
 # Begin Source File