diff --git a/src/beeper.h b/src/beeper.h
index 47649f512..3e7a316a8 100644
--- a/src/beeper.h
+++ b/src/beeper.h
@@ -81,14 +81,14 @@ inline void AUDIO_HEARTBEAT()
       warbleC = warble && !warbleC;
       if (warbleC) {
 #if defined(PCBV4)
-        TCCR0A &= ~(0b01<<COM0A0);
+        TCCR0A &= ~( 1 << COM0A0);
 #else
         PORTE &= ~(1 << OUT_E_BUZZER); // speaker output 'low'
 #endif
       }
       else {
 #if defined(PCBV4)
-        TCCR0A |= (0b01<<COM0A0);  // tone on
+        TCCR0A |= (1 << COM0A0);  // tone on
 #else
         PORTE |= (1 << OUT_E_BUZZER); // speaker output 'high'
 #endif
@@ -96,7 +96,7 @@ inline void AUDIO_HEARTBEAT()
     }
     else {
 #if defined(PCBV4)
-      TCCR0A &= ~(0b01<<COM0A0);
+      TCCR0A &= ~(1 << COM0A0);
 #else
       PORTE &= ~(1 << OUT_E_BUZZER); // speaker output 'low'
 #endif
diff --git a/src/ff.cpp b/src/ff.cpp
index f973d2eea..77ba6227f 100644
--- a/src/ff.cpp
+++ b/src/ff.cpp
@@ -2079,7 +2079,7 @@ FRESULT f_open (
 			}
 		}
 		if (res == FR_OK && (mode & FA_CREATE_ALWAYS)) {	/* Truncate it if overwrite mode */
-			dw = get_fattime();					/* Created time */
+			dw = o9x_get_fattime();					/* Created time */
 			ST_DWORD(dir+DIR_CrtTime, dw);
 			dir[DIR_Attr] = 0;					/* Reset attribute */
 			ST_DWORD(dir+DIR_FileSize, 0);		/* size = 0 */
@@ -2384,7 +2384,7 @@ FRESULT f_sync (
 				dir[DIR_Attr] |= AM_ARC;					/* Set archive bit */
 				ST_DWORD(dir+DIR_FileSize, fp->fsize);		/* Update file size */
 				ST_CLUST(dir, fp->org_clust);				/* Update start cluster */
-				tim = get_fattime();						/* Update updated time */
+				tim = o9x_get_fattime();						/* Update updated time */
 				ST_DWORD(dir+DIR_WrtTime, tim);
 				fp->flag &= ~FA__WRITTEN;
 				fp->fs->wflag = 1;
@@ -3036,7 +3036,7 @@ FRESULT f_mkdir (
 	FRESULT res;
 	DIR dj;
 	BYTE *dir, n;
-	DWORD dsc, dcl, pcl, tim = get_fattime();
+	DWORD dsc, dcl, pcl, tim = o9x_get_fattime();
 	DEF_NAMEBUF;
 
 
@@ -3461,7 +3461,7 @@ FRESULT f_mkfs (
 	ST_WORD(tbl+BPB_SecPerTrk, 63);			/* Number of sectors per track */
 	ST_WORD(tbl+BPB_NumHeads, 255);			/* Number of heads */
 	ST_DWORD(tbl+BPB_HiddSec, b_vol);		/* Hidden sectors */
-	n = get_fattime();						/* Use current time as VSN */
+	n = o9x_get_fattime();						/* Use current time as VSN */
 	if (fmt == FS_FAT32) {
 		ST_DWORD(tbl+BS_VolID32, n);		/* VSN */
 		ST_DWORD(tbl+BPB_FATSz32, n_fat);	/* Number of sectors per FAT */
diff --git a/src/ff.h b/src/ff.h
index 6339ef22f..fc5f34065 100644
--- a/src/ff.h
+++ b/src/ff.h
@@ -474,7 +474,7 @@ TCHAR* f_gets (TCHAR*, int, FIL*);					/* Get a string from the file */
 
 /* RTC function */
 #if !_FS_READONLY
-extern uint32_t get_fattime (void); /* Returns 32-bit packed date and time */
+extern uint32_t o9x_get_fattime (void); /* Returns 32-bit packed date and time */
 #endif
 
 /* Unicode support functions */
diff --git a/src/open9x.cpp b/src/open9x.cpp
index 93de4deb9..e147f8d32 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -1966,7 +1966,7 @@ ISR(USART0_UDRE_vect)
 /* the system does not support a real time clock.          */
 /* This is not required in read-only configuration.        */
 
-uint32_t get_fattime(void) // TODO why not in ff.cpp?
+uint32_t o9x_get_fattime(void) // TODO why not in ff.cpp?
 {
   struct gtm t;
   filltm(&g_unixTime, &t); // create a struct tm date/time structure from global unix time stamp
diff --git a/src/simpgmspace.h b/src/simpgmspace.h
index 50b03fbfb..9ce23661c 100644
--- a/src/simpgmspace.h
+++ b/src/simpgmspace.h
@@ -142,10 +142,12 @@ extern sem_t eeprom_write_sem;
 #define TCCR1B dummyport
 #define TCCR1C dummyport
 #define COM1B0 dummyport
+#define COM0A0 dummyport
 
 #define TCNT1 dummyport16
 #define ICR1 dummyport16
 #define TIFR dummyport
+#define TIFR1 dummyport
 #define ETIFR dummyport
 
 #define SPDR dummyport