diff --git a/Tools/MCADefrag/Globals.h b/Tools/MCADefrag/Globals.h
index 0f31de7e3..17dc3920d 100644
--- a/Tools/MCADefrag/Globals.h
+++ b/Tools/MCADefrag/Globals.h
@@ -225,6 +225,7 @@ template <typename Type> class cItemCallback
 public:
 	/// Called for each item in the internal list; return true to stop the loop, or false to continue enumerating
 	virtual bool Item(Type * a_Type) = 0;
+	virtual ~cItemCallback();
 } ;
 
 
diff --git a/src/Simulator/IncrementalRedstoneSimulator.h b/src/Simulator/IncrementalRedstoneSimulator.h
index 233a3d408..a57a17328 100644
--- a/src/Simulator/IncrementalRedstoneSimulator.h
+++ b/src/Simulator/IncrementalRedstoneSimulator.h
@@ -202,8 +202,13 @@ private:
 			case E_BLOCK_POWERED_RAIL:
 			{
 				return true;
+				break;
+			}
+			default:
+			{
+				return false;
+				break;
 			}
-			default: return false;
 		}
 	}
 
@@ -275,8 +280,13 @@ private:
 			case E_BLOCK_PISTON:
 			{
 				 return true;
+				 break;
+			}
+			default:
+			{
+				return false;
+				break;
 			}
-			default: return false;
 		}
 	}
 };