diff --git a/src/debugger/CpuDebug.cxx b/src/debugger/CpuDebug.cxx
index ffa5acbe7..08deb0820 100644
--- a/src/debugger/CpuDebug.cxx
+++ b/src/debugger/CpuDebug.cxx
@@ -74,13 +74,13 @@ void CpuDebug::saveOldState()
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CpuDebug::setPC(int pc)
 {
-  my6502.PC = pc;
+  my6502.PC = uInt16(pc);
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CpuDebug::setSP(int sp)
 {
-  my6502.SP = sp;
+  my6502.SP = uInt8(sp);
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -92,19 +92,19 @@ void CpuDebug::setPS(int ps)
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CpuDebug::setA(int a)
 {
-  my6502.A = a;
+  my6502.A = uInt8(a);
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CpuDebug::setX(int x)
 {
-  my6502.X = x;
+  my6502.X = uInt8(x);
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CpuDebug::setY(int y)
 {
-  my6502.Y = y;
+  my6502.Y = uInt8(y);
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -120,7 +120,7 @@ void CpuDebug::setV(bool on)
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-void CpuDebug::setB(bool on)
+void CpuDebug::setB(bool)
 {
   // nop - B is always true
 }
diff --git a/src/emucore/Device.hxx b/src/emucore/Device.hxx
index b19199035..8a98fd820 100644
--- a/src/emucore/Device.hxx
+++ b/src/emucore/Device.hxx
@@ -112,12 +112,17 @@ class Device : public Serializable
     virtual bool poke(uInt16 address, uInt8 value) = 0;
 
     /**
-      Query/change the given address type to use the given disassembly flags
+      Query the given address for its disassembly flags
 
       @param address The address to modify
-      @param flags A bitfield of DisasmType directives for the given address
     */
     virtual uInt8 getAccessFlags(uInt16 address) const { return 0; }
+    /**
+      Change the given address type to use the given disassembly flags
+
+      @param address The address to modify
+      @param flags   A bitfield of DisasmType directives for the given address
+    */
     virtual void setAccessFlags(uInt16 address, uInt8 flags) { }
 
   protected:
diff --git a/src/emucore/TIA.hxx b/src/emucore/TIA.hxx
index e2181da7b..db5464d32 100644
--- a/src/emucore/TIA.hxx
+++ b/src/emucore/TIA.hxx
@@ -217,7 +217,7 @@ class TIA : public Device
       based on how many frames of out the total count are PAL frames.
     */
     bool isPAL() const
-      { return float(myPALFrameCounter) / myFrameCounter >= (25.0/60.0); }
+      { return double(myPALFrameCounter) / myFrameCounter >= (25.0/60.0); }
 
     /**
       Answers the current color clock we've gotten to on this scanline.
diff --git a/src/gui/Rect.hxx b/src/gui/Rect.hxx
index 4d4113615..e369599fc 100644
--- a/src/gui/Rect.hxx
+++ b/src/gui/Rect.hxx
@@ -34,15 +34,15 @@ namespace GUI {
 */
 struct Point
 {
-  int x;  //!< The horizontal part of the point
-  int y;  //!< The vertical part of the point
+  uInt32 x;  //!< The horizontal part of the point
+  uInt32 y;  //!< The vertical part of the point
 
   Point() : x(0), y(0) { }
   Point(const Point& p) : x(p.x), y(p.y) { }
-  explicit Point(int x1, int y1) : x(x1), y(y1) { }
+  explicit Point(uInt32 x1, uInt32 y1) : x(x1), y(y1) { }
   Point(const string& p) {
     char c = '\0';
-    x = y = -1;
+    x = y = 0;
     istringstream buf(p);
     buf >> x >> c >> y;
     if(c != 'x')