diff --git a/DCCWaveform.cpp b/DCCWaveform.cpp
index 0258627..bc80809 100644
--- a/DCCWaveform.cpp
+++ b/DCCWaveform.cpp
@@ -92,7 +92,7 @@ void DCCWaveform::interruptHandler() {
   else DCCACK::checkAck(progTrack.sentResetsSincePacket);
 
 }
-#pragma GCC push_options
+#pragma GCC pop_options
 
 // An instance of this class handles the DCC transmissions for one track. (main or prog)
 // Interrupts are marshalled via the statics.
@@ -115,7 +115,7 @@ DCCWaveform::DCCWaveform( byte preambleBits, bool isMain) {
 
 
 
-        
+#pragma GCC push_options
 #pragma GCC optimize ("-O3")
 void DCCWaveform::interrupt2() {
   // calculate the next bit to be sent:
@@ -172,6 +172,7 @@ void DCCWaveform::interrupt2() {
     }
   }  
 }
+#pragma GCC pop_options
 
 // Wait until there is no packet pending, then make this pending
 void DCCWaveform::schedulePacket(const byte buffer[], byte byteCount, byte repeats) {
@@ -190,4 +191,4 @@ void DCCWaveform::schedulePacket(const byte buffer[], byte byteCount, byte repea
   packetPending = true;
   sentResetsSincePacket=0;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/defines.h b/defines.h
index d2aba22..23a7993 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,6 @@
 
 #ifndef DEFINES_H
 #define DEFINES_H
-
 // defines.h relies on macros defined in config.h
 // but it may have already been included (for cosmetic convenence) by the .ino
 #ifndef MOTOR_SHIELD_TYPE