diff --git a/VBA.vcproj b/VBA.vcproj
index 63b67a77..88c3a3c9 100644
--- a/VBA.vcproj
+++ b/VBA.vcproj
@@ -158,12 +158,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="3"
 				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="false"
-				FavorSizeOrSpeed="0"
-				OmitFramePointers="false"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="false"
+				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)zlib&quot;;&quot;$(SolutionDir)libpng&quot;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;FINAL_VERSION;MMX;_CRT_SECURE_NO_WARNINGS"
 				IgnoreStandardIncludePath="false"
@@ -219,7 +220,7 @@
 				ShowProgress="0"
 				OutputFile="$(ProjectDir)VisualBoyAdvance.exe"
 				Version=""
-				LinkIncremental="2"
+				LinkIncremental="0"
 				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
 				GenerateManifest="false"
@@ -233,6 +234,7 @@
 				OptimizeReferences="0"
 				EnableCOMDATFolding="0"
 				OptimizeForWindows98="1"
+				LinkTimeCodeGeneration="1"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -425,6 +427,14 @@
 				<File
 					RelativePath=".\src\2xSaI.cpp"
 					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							WholeProgramOptimization="true"
+						/>
+					</FileConfiguration>
 				</File>
 				<File
 					RelativePath=".\src\2xSaImmx.asm"
diff --git a/src/snd_interp.cpp b/src/snd_interp.cpp
index 06ccc352..a544bb8c 100644
--- a/src/snd_interp.cpp
+++ b/src/snd_interp.cpp
@@ -171,7 +171,7 @@ public:
 		return filled;
 	}
 
-	void push_back(T sample)
+	inline void push_back(T sample)
 	{
 		if (!buffer) buffer = new T[buffer_size];
 		buffer[ptr] = sample;
@@ -179,13 +179,13 @@ public:
 		if (filled < buffer_size) filled++;
 	}
 
-	void erase(int count)
+	inline void erase(int count)
 	{
 		if (count > filled) filled = 0;
 		else filled -= count;
 	}
 
-	T operator[] (int index) const
+	inline T operator[] (int index) const
 	{
 		index += ptr - filled;
 		if (index < 0) index += buffer_size;
@@ -459,7 +459,7 @@ public:
 				in[used] = samples[used];
 			}
 
-			returned = resample_process(resampler, 32767 / lrate, in, count, 0, &used, &out, 1);
+			returned = resample_process(resampler, 32767. / lrate, in, count, 0, &used, &out, 1);
 			if (used)
 			{
 				samples.erase(used);