diff --git a/src/emucore/CartCTY.cxx b/src/emucore/CartCTY.cxx
index 8e793eddc..2d2b22f9e 100644
--- a/src/emucore/CartCTY.cxx
+++ b/src/emucore/CartCTY.cxx
@@ -31,6 +31,7 @@ CartridgeCTY::CartridgeCTY(const uInt8* image, uInt32 size, const OSystem& osyst
   : Cartridge(osystem.settings()),
     myOSystem(osystem),
     myOperationType(0),
+    myLDAimmediate(false),
     myRamAccessTimeout(0)
 {
   // Copy the ROM image into my buffer
@@ -89,13 +90,22 @@ uInt8 CartridgeCTY::peek(uInt16 address)
 {
   uInt16 peekAddress = address;
   address &= 0x0FFF;
-  uInt8 peekValue = myImage[(myCurrentBank << 12) + address];
+  uInt8 peekValue = myImage[myCurrentBank + address];
 
   // In debugger/bank-locked mode, we ignore all hotspots and in general
   // anything that can change the internal state of the cart
   if(bankLocked())
     return peekValue;
 
+  // Check for aliasing to 'LDA #$F2'
+  if(myLDAimmediate && peekValue == 0xF2)
+  {
+    myLDAimmediate = false;
+    return 0xF2;  // FIXME - return frequency value here
+  }
+  else
+    myLDAimmediate = false;
+
   if(address < 0x0040)  // Write port is at $1000 - $103F (64 bytes)
   {
     // Reading from the write port triggers an unwanted write
@@ -149,7 +159,11 @@ uInt8 CartridgeCTY::peek(uInt16 address)
       default:
         break;
     }
-    return myImage[(myCurrentBank << 12) + address];
+
+    // Is this instruction an immediate mode LDA?
+    myLDAimmediate = (peekValue == 0xA9);
+
+    return myImage[myCurrentBank + address];
   }
 }
 
@@ -211,26 +225,14 @@ bool CartridgeCTY::bank(uInt16 bank)
   if(bankLocked()) return false;
 
   // Remember what bank we're in
-  myCurrentBank = bank;
-  uInt16 offset = myCurrentBank << 12;
+  myCurrentBank = bank << 12;
   uInt16 shift = mySystem->pageShift();
-  uInt16 mask = mySystem->pageMask();
-
-  System::PageAccess access(0, 0, 0, this, System::PA_READ);
-
-  // Set the page accessing methods for the hot spots
-  for(uInt32 i = (0x1FF4 & ~mask); i < 0x2000; i += (1 << shift))
-  {
-    access.codeAccessBase = &myCodeAccessBase[offset + (i & 0x0FFF)];
-    mySystem->setPageAccess(i >> shift, access);
-  }
 
   // Setup the page access methods for the current bank
-  for(uInt32 address = 0x1080; address < (0x1FF4U & ~mask);
-      address += (1 << shift))
+  System::PageAccess access(0, 0, 0, this, System::PA_READ);
+  for(uInt32 address = 0x1080; address < 0x2000; address += (1 << shift))
   {
-    access.directPeekBase = &myImage[offset + (address & 0x0FFF)];
-    access.codeAccessBase = &myCodeAccessBase[offset + (address & 0x0FFF)];
+    access.codeAccessBase = &myCodeAccessBase[myCurrentBank + (address & 0x0FFF)];
     mySystem->setPageAccess(address >> shift, access);
   }
   return myBankChanged = true;
@@ -239,7 +241,7 @@ bool CartridgeCTY::bank(uInt16 bank)
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 uInt16 CartridgeCTY::bank() const
 {
-  return myCurrentBank;
+  return myCurrentBank >> 12;
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -261,7 +263,7 @@ bool CartridgeCTY::patch(uInt16 address, uInt8 value)
     myRAM[address & 0x003F] = value;
   }
   else
-    myImage[(myCurrentBank << 12) + address] = value;
+    myImage[myCurrentBank + address] = value;
 
   return myBankChanged = true;
 } 
@@ -279,7 +281,7 @@ bool CartridgeCTY::save(Serializer& out) const
   try
   {
     out.putString(name());
-    out.putShort(myCurrentBank);
+    out.putShort(bank());
     out.putByte(myOperationType);
     out.putByteArray(myRAM, 64);
   }
@@ -300,7 +302,9 @@ bool CartridgeCTY::load(Serializer& in)
     if(in.getString() != name())
       return false;
 
-    myCurrentBank = in.getShort();
+    // Remember what bank we were in
+    bank(in.getShort());
+
     myOperationType = in.getByte();
     in.getByteArray(myRAM, 64);
   }
@@ -309,10 +313,6 @@ bool CartridgeCTY::load(Serializer& in)
     cerr << "ERROR: CartridgeCTY::load" << endl << "  " << msg << endl;
     return false;
   }
-
-  // Remember what bank we were in
-  bank(myCurrentBank);
-
   return true;
 }
 
@@ -383,7 +383,7 @@ uInt8 CartridgeCTY::ramReadWrite()
         break;
     }
     // Bit 6 is 1, busy
-    return myImage[(myCurrentBank << 12) + 0xFF4] | 0x40;
+    return myImage[myCurrentBank + 0xFF4] | 0x40;
   }
   else
   {
@@ -394,11 +394,11 @@ uInt8 CartridgeCTY::ramReadWrite()
       myRAM[0] = 0;            // Successful operation
 
       // Bit 6 is 0, ready/success
-      return myImage[(myCurrentBank << 12) + 0xFF4] & ~0x40;
+      return myImage[myCurrentBank + 0xFF4] & ~0x40;
     }
     else
       // Bit 6 is 1, busy
-      return myImage[(myCurrentBank << 12) + 0xFF4] | 0x40;
+      return myImage[myCurrentBank + 0xFF4] | 0x40;
   }
 }
 
diff --git a/src/emucore/CartCTY.hxx b/src/emucore/CartCTY.hxx
index c40b456ac..e59768fa2 100644
--- a/src/emucore/CartCTY.hxx
+++ b/src/emucore/CartCTY.hxx
@@ -258,6 +258,9 @@ class CartridgeCTY : public Cartridge
     // Data is accessed from Harmony EEPROM
     uInt8 myTuneRAM[8192];
 
+    // Flags that last byte peeked was A9 (LDA #)
+    bool myLDAimmediate;
+
     // The time after which the first request of a load/save operation
     // will actually be completed
     // Due to Harmony EEPROM constraints, a read/write isn't instantaneous,
diff --git a/src/emucore/Paddles.hxx b/src/emucore/Paddles.hxx
index 44e267860..6c10eccd4 100644
--- a/src/emucore/Paddles.hxx
+++ b/src/emucore/Paddles.hxx
@@ -127,8 +127,6 @@ class Paddles : public Controller
     int myLastAxisX, myLastAxisY;
     int myAxisDigitalZero, myAxisDigitalOne;
 
-    bool mySwapPorts;
-
     static int _DIGITAL_SENSITIVITY, _DIGITAL_DISTANCE;
     static int _MOUSE_SENSITIVITY;