diff --git a/Source/Processors/SpikeDetector.cpp b/Source/Processors/SpikeDetector.cpp
index 9bf66fe386b1072a7a5caefd3835d0895ab1abe5..4b4908bea981a31257ae60ea6f8789208a3acc2f 100755
--- a/Source/Processors/SpikeDetector.cpp
+++ b/Source/Processors/SpikeDetector.cpp
@@ -105,7 +105,7 @@ bool SpikeDetector::addElectrode(int nChans)
 
     int firstChan;
 
-    if (electrodes.size() == 0 || !paramsWereLoaded)
+    if (electrodes.size() == 0)
     {
         firstChan = 0;
     }
@@ -117,7 +117,7 @@ bool SpikeDetector::addElectrode(int nChans)
 
     if (firstChan + nChans > getNumInputs())
     {
-        return false;
+        firstChan = 0; // make sure we don't overflow available channels
     }
 
     int currentVal = electrodeCounter[nChans];
diff --git a/Source/UI/EditorViewport.cpp b/Source/UI/EditorViewport.cpp
index ea774886ff3bbd3b867731588522550dc803e376..e572998174c7097e710d7e3617a02e727c291d3e 100755
--- a/Source/UI/EditorViewport.cpp
+++ b/Source/UI/EditorViewport.cpp
@@ -1338,7 +1338,7 @@ const String EditorViewport::loadState(File fileToLoad)
     // {
     //     return "No configuration selected.";
     // }
-	int maxID=100;
+	int maxID = 100;
     currentFile = fileToLoad;
 
     std::cout << "Loading processor graph." << std::endl;
@@ -1518,7 +1518,7 @@ const String EditorViewport::loadState(File fileToLoad)
 void EditorViewport::setParametersByXML(GenericProcessor* targetProcessor, XmlElement* processorXML)
 {
     // Should probably do some error checking to make sure XML is valid, depending on how it treats errors (will likely just not update parameters, but error message could be nice.)
-    int numberParameters=targetProcessor->getNumParameters();
+    int numberParameters = targetProcessor->getNumParameters();
     // Ditto channels. Not sure how to handle different channel sizes when variable sources (file reader etc. change). Maybe I should check number of channels vs source, but that requires hardcoding when source matters.
     //int numChannels=(targetProcessor->channels).size();
     //int numEventChannels=(targetProcessor->eventChannels).size();
@@ -1546,7 +1546,7 @@ void EditorViewport::setParametersByXML(GenericProcessor* targetProcessor, XmlEl
 
             for (int j = 0; j < numberParameters; ++j)
             {
-                parameterNameForXML=targetProcessor->getParameterName(j);
+                parameterNameForXML = targetProcessor->getParameterName(j);
 
                 if (parameterXML->getStringAttribute("name")==parameterNameForXML)
                 {