diff --git a/src/projectM-engine/CustomWave.cpp b/src/projectM-engine/CustomWave.cpp
index aec12f6d6..81390705f 100755
--- a/src/projectM-engine/CustomWave.cpp
+++ b/src/projectM-engine/CustomWave.cpp
@@ -481,6 +481,14 @@ void CustomWave::evalPerPointEqns() {
 
   int x;
 
+  assert(samples > 0);
+  assert(r_mesh);
+assert(g_mesh);
+assert(b_mesh);
+assert(a_mesh);
+assert(x_mesh);
+assert(y_mesh);
+
   for (x = 0; x < samples; x++)
     r_mesh[x] = r;
   for (x = 0; x < samples; x++)
diff --git a/src/projectM-engine/Preset.cpp b/src/projectM-engine/Preset.cpp
index bdec37f85..7dea5f5fd 100755
--- a/src/projectM-engine/Preset.cpp
+++ b/src/projectM-engine/Preset.cpp
@@ -119,16 +119,8 @@ int Preset::add_per_pixel_eqn(char * name, GenExpr * gen_expr)
     return PROJECTM_FAILURE;
   }
 
-  if (per_pixel_eqn_tree.empty())
-  {
-    index = 0;
-  }
-  else
-  {
-    std::map<int, PerPixelEqn*>::iterator lastPos = per_pixel_eqn_tree.end();
     index = per_pixel_eqn_tree.size();
-  }
-
+  
   /* Create the per pixel equation given the index, parameter, and general expression */
   if ((per_pixel_eqn = new PerPixelEqn(index, param, gen_expr)) == NULL)
   {
diff --git a/src/projectM-engine/console_interface.cpp b/src/projectM-engine/console_interface.cpp
index 9645baed6..b9705ba15 100755
--- a/src/projectM-engine/console_interface.cpp
+++ b/src/projectM-engine/console_interface.cpp
@@ -166,6 +166,7 @@ void projectM::default_key_handler( projectMEvent event, projectMKeycode keycode
 		if (((*m_presetPos) == m_presetChooser->end())) {
 			*m_presetPos = m_presetChooser->begin();
 		}
+		m_activePreset = std::auto_ptr<Preset>(0);
 
 		m_activePreset =  m_presetPos->allocate(this->presetInputs, this->presetOutputs);
 	      break;