diff --git a/Components/9918/9918.cpp b/Components/9918/9918.cpp
index 7d41b5af6..9a5e20643 100644
--- a/Components/9918/9918.cpp
+++ b/Components/9918/9918.cpp
@@ -489,7 +489,7 @@ void TMS9918::set_register(int address, uint8_t value) {
 			break;
 
 			case 3:
-				colour_table_address_ = size_t(low_write_ << 6) | 0x1f;
+				colour_table_address_ = size_t(low_write_ << 6) | 0x3f;
 			break;
 
 			case 4:
diff --git a/Components/9918/Implementation/9918Base.hpp b/Components/9918/Implementation/9918Base.hpp
index c0c310bac..77add1839 100644
--- a/Components/9918/Implementation/9918Base.hpp
+++ b/Components/9918/Implementation/9918Base.hpp
@@ -530,8 +530,8 @@ class Base {
 #define fetch_tile_name(column) line_buffer.names[column].offset = ram_[(row_base + column) & 0x3fff];
 
 #define fetch_tile(column)	{\
-		line_buffer.patterns[column][1] = ram_[(colour_base + static_cast<size_t>((line_buffer.names[column].offset << 3) >> colour_name_shift)) & 0x3fff];		\
-		line_buffer.patterns[column][0] = ram_[(pattern_base + static_cast<size_t>(line_buffer.names[column].offset << 3)) & 0x3fff];	\
+		line_buffer.patterns[column][1] = ram_[(colour_base + size_t((line_buffer.names[column].offset << 3) >> colour_name_shift)) & 0x3fff];		\
+		line_buffer.patterns[column][0] = ram_[(pattern_base + size_t(line_buffer.names[column].offset << 3)) & 0x3fff];	\
 	}
 
 #define background_fetch_block(location, column, sprite)	\
@@ -568,7 +568,7 @@ class Base {
 				colour_base += size_t(write_pointer_.row & 7);
 				colour_name_shift = 0;
 			} else {
-				colour_base &= size_t(0xffc0 | (write_pointer_.row & 7));
+				colour_base &= size_t(0xffc0);
 				pattern_base &= size_t(0x3800);
 			}