diff --git a/src/libprojectM/BuiltinParams.cpp b/src/libprojectM/BuiltinParams.cpp
index b4b5a6e00..694ec9005 100644
--- a/src/libprojectM/BuiltinParams.cpp
+++ b/src/libprojectM/BuiltinParams.cpp
@@ -10,9 +10,11 @@
 
 BuiltinParams::BuiltinParams() {}
 
-BuiltinParams::BuiltinParams(const PresetInputs & presetInputs, PresetOutputs & presetOutputs)
+BuiltinParams::BuiltinParams(PresetInputs & presetInputs, PresetOutputs & presetOutputs)
 {
 
+  presetInputs.Initialize(presetOutputs.gx, presetOutputs.gy);
+
   int ret;
   if ((ret = init_builtin_param_db(presetInputs, presetOutputs)) != PROJECTM_SUCCESS)
   {
diff --git a/src/libprojectM/BuiltinParams.hpp b/src/libprojectM/BuiltinParams.hpp
index 5d45e7922..71b532931 100644
--- a/src/libprojectM/BuiltinParams.hpp
+++ b/src/libprojectM/BuiltinParams.hpp
@@ -42,7 +42,7 @@ public:
 
     /** Construct a new builtin parameter database with variables references given by
      * the preset input and output structures */
-     BuiltinParams(const PresetInputs &  presetInputs, PresetOutputs & presetOutputs);
+     BuiltinParams(PresetInputs &  presetInputs, PresetOutputs & presetOutputs);
 
     ~BuiltinParams();
 
diff --git a/src/libprojectM/MilkdropPreset.cpp b/src/libprojectM/MilkdropPreset.cpp
index 70d08a6ee..c7e055998 100755
--- a/src/libprojectM/MilkdropPreset.cpp
+++ b/src/libprojectM/MilkdropPreset.cpp
@@ -44,8 +44,6 @@ MilkdropPreset::MilkdropPreset(std::istream & in, const std::string & presetName
     	builtinParams(_presetInputs, presetOutputs),
     	_presetOutputs(presetOutputs)
 {
-  _presetInputs.gx = _presetOutputs.gx;
-  _presetInputs.gy = _presetOutputs.gy;
   initialize(in);
 
 }
@@ -55,7 +53,6 @@ MilkdropPreset::MilkdropPreset(const std::string & absoluteFilePath, const std::
     _absoluteFilePath(absoluteFilePath),
     _presetOutputs(presetOutputs)
 {
-  _presetInputs.Initialize(_presetOutputs.gx ,_presetOutputs.gy);
 
   initialize(absoluteFilePath);
 
diff --git a/src/libprojectM/MilkdropPresetFactory.cpp b/src/libprojectM/MilkdropPresetFactory.cpp
index 73dcd698e..0d9e4da1f 100644
--- a/src/libprojectM/MilkdropPresetFactory.cpp
+++ b/src/libprojectM/MilkdropPresetFactory.cpp
@@ -185,7 +185,7 @@ void MilkdropPresetFactory::initializePresetOutputs(int gx, int gy)
 
 	/* Q AND T VARIABLES START */
 
-	for (int i = 0;i<32;i++)
+	for (int i = 0;i<NUM_Q_VARIABLES;i++)
 		_presetOutputs.q[i] = 0;
 
 	/* Q AND T VARIABLES END */