diff --git a/src/eeprom_avr.cpp b/src/eeprom_avr.cpp
index 093cea99b..96db26e30 100644
--- a/src/eeprom_avr.cpp
+++ b/src/eeprom_avr.cpp
@@ -816,7 +816,7 @@ bool eeLoadGeneral()
   if (theFile.readRlc((uint8_t*)&g_eeGeneral, 1) == 1 && g_eeGeneral.version == EEPROM_VER) {
     theFile.openRlc(FILE_GENERAL);
     if (theFile.readRlc((uint8_t*)&g_eeGeneral, sizeof(g_eeGeneral)) <= sizeof(EEGeneral)) {
-#if defined(PCBSTD)
+#if defined(M64)
       if (g_eeGeneral.variant == EEPROM_VARIANT && g_eeGeneral.chkSum == evalChkSum()) {
         return true;
       }
diff --git a/src/sky9x/diskio.cpp b/src/sky9x/diskio.cpp
index a3e9ca3b4..aebf7e663 100644
--- a/src/sky9x/diskio.cpp
+++ b/src/sky9x/diskio.cpp
@@ -1390,10 +1390,7 @@ DRESULT disk_ioctl (
                                 break;
 
                         case GET_SECTOR_COUNT : /* Get number of sectors on the disk (DWORD) */
-                                if (Cmd_A41_resp & OCR_SD_CCS)
-                                  *(DWORD*)buff = SD_CSD_BLOCKNR_HC(Card_CSD);
-                                else
-                                  *(DWORD*)buff = SD_CSD_BLOCKNR(Card_CSD);
+                                *DWORD*)buff = SD_GET_BLOCKNR();
                                 res = RES_OK;
                                 break;