diff --git a/tmk_core/common/avr/suspend.c b/tmk_core/common/avr/suspend.c
index 02d7e4c..0e13eb6 100644
--- a/tmk_core/common/avr/suspend.c
+++ b/tmk_core/common/avr/suspend.c
@@ -72,11 +72,13 @@ static void power_down(uint8_t wdto)
 
 static void standby(void)
 {
+#ifdef SLEEP_MODE_STANDBY
     set_sleep_mode(SLEEP_MODE_STANDBY);
     sleep_enable();
     sei();
     sleep_cpu();
     sleep_disable();
+#endif
 }
 
 static void idle(void)
diff --git a/tmk_core/common/avr/timer.c b/tmk_core/common/avr/timer.c
index 292b41c..1aa4a6a 100644
--- a/tmk_core/common/avr/timer.c
+++ b/tmk_core/common/avr/timer.c
@@ -46,7 +46,11 @@ void timer_init(void)
 #endif
 
     OCR0A = TIMER_RAW_TOP;
+#ifdef TIMSK0
     TIMSK0 = (1<<OCIE0A);
+#else
+    TIMSK = (1<<OCIE0A);
+#endif
 }
 
 inline