diff --git a/.gitignore b/.gitignore
index 1ea3fff8..ff6d5d67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ Output/Songs
 *.ipch
 
 *.log
+/Output/x64/gstreamer/GstreamerHelper.dll
diff --git a/GstreamerHelper/GstreamerVideo.cpp b/GstreamerHelper/GstreamerVideo.cpp
index 7834eef1..214f0709 100644
--- a/GstreamerHelper/GstreamerVideo.cpp
+++ b/GstreamerHelper/GstreamerVideo.cpp
@@ -65,7 +65,7 @@ DllExport bool CloseVideo(int Stream)
 
 DllExport int GetVideoNumStreams()
 {
-	return VideoStreams.size();
+	return (int) VideoStreams.size();
 }
 
 DllExport float GetVideoLength(int Stream)
@@ -85,6 +85,13 @@ DllExport struct ApplicationFrame GetFrame(int Stream, float Time)
 	{
 		return it->second->GetFrame(Time);
 	}
+	struct ApplicationFrame returnFrame;
+	returnFrame.size=0;
+	returnFrame.width=0;
+	returnFrame.height=0;
+	returnFrame.data=NULL;
+	returnFrame.videotime=0;
+	return returnFrame;
 }
 
 DllExport bool Skip(int Stream, float Start, float Gap)
diff --git a/GstreamerHelper/GstreamerVideoStream.cpp b/GstreamerHelper/GstreamerVideoStream.cpp
index d67f4656..93c98df0 100644
--- a/GstreamerHelper/GstreamerVideoStream.cpp
+++ b/GstreamerHelper/GstreamerVideoStream.cpp
@@ -180,7 +180,7 @@ struct ApplicationFrame GstreamerVideoStream::GetFrame(float Time)
 
 				gst_buffer_map(Buffer, &Mapinfo, GST_MAP_READ);
 
-				Size = Mapinfo.size;
+				Size = (int) Mapinfo.size;
 				gst_structure_get_int (BufferStructure, "width", &Width);
 				gst_structure_get_int (BufferStructure, "height", &Height);
 				VideoTime = (float) (Buffer->pts / GST_SECOND);
@@ -210,7 +210,7 @@ struct ApplicationFrame GstreamerVideoStream::GetFrame(float Time)
 
 bool GstreamerVideoStream::Skip(float Start, float Gap)
 {
-	if(!gst_element_seek_simple(Element, GST_FORMAT_TIME, (GstSeekFlags)(GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE), (Start + Gap) * GST_SECOND))
+	if(!gst_element_seek_simple(Element, GST_FORMAT_TIME, (GstSeekFlags)(GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_ACCURATE), (gint64)((Start + Gap) * GST_SECOND)))
 	{
 		LogVideoError("Seek failed");
 		return true;
diff --git a/GstreamerHelper/GstreamerVideoStream.h b/GstreamerHelper/GstreamerVideoStream.h
index 29183571..7d69e019 100644
--- a/GstreamerHelper/GstreamerVideoStream.h
+++ b/GstreamerHelper/GstreamerVideoStream.h
@@ -57,7 +57,7 @@ private:
 	volatile gboolean Copying;
 
 	gboolean Paused;
-	gboolean Finished;
+	bool Finished;
 
 	gfloat Duration;
 
diff --git a/Output/x64/gstreamer/GstreamerHelper.dll b/Output/x64/gstreamer/GstreamerHelper.dll
deleted file mode 100644
index c647f7a1..00000000
Binary files a/Output/x64/gstreamer/GstreamerHelper.dll and /dev/null differ
diff --git a/Vocaluxe/Lib/Video/CVideoDecoderGstreamer.cs b/Vocaluxe/Lib/Video/CVideoDecoderGstreamer.cs
index 72c59faf..13f5b04f 100644
--- a/Vocaluxe/Lib/Video/CVideoDecoderGstreamer.cs
+++ b/Vocaluxe/Lib/Video/CVideoDecoderGstreamer.cs
@@ -42,7 +42,7 @@ namespace Vocaluxe.Lib.Video
                 i = CGstreamerVideoWrapper.LoadVideo(u.AbsoluteUri);
                 return i;
             }
-            catch (Exception e) { }
+            catch (Exception) { }
             return i;
         }
 
diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj
index ce5349c8..7daa59d0 100644
--- a/Vocaluxe/Vocaluxe.csproj
+++ b/Vocaluxe/Vocaluxe.csproj
@@ -13,6 +13,9 @@
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <IsWebBootstrapper>false</IsWebBootstrapper>
+    <StartupObject>Vocaluxe.MainProgram</StartupObject>
+    <ApplicationIcon>Vocaluxe.ico</ApplicationIcon>
+    <TargetFrameworkProfile />
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -27,9 +30,6 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <StartupObject>Vocaluxe.MainProgram</StartupObject>
-    <ApplicationIcon>Vocaluxe.ico</ApplicationIcon>
-    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -63,6 +63,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+    <CodeAnalysisRuleSet>ExtendedCorrectnessRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|x64'">
     <PlatformTarget>x64</PlatformTarget>
diff --git a/gstreamerhelper/VocaluxeClock.cpp b/gstreamerhelper/VocaluxeClock.cpp
index cfe7e677..ba84cfd0 100644
--- a/gstreamerhelper/VocaluxeClock.cpp
+++ b/gstreamerhelper/VocaluxeClock.cpp
@@ -70,7 +70,7 @@ vocaluxe_clock_get_internal_time (GstClock * clock)
 
   _vocaluxeclock = GST_VOCALUXE_CLOCK_CAST (clock);
 
-  result = _vocaluxeclock->time * GST_SECOND;
+  result = (GstClockTime) _vocaluxeclock->time * GST_SECOND;
   return result;
 }