diff --git a/src/emu/save.cpp b/src/emu/save.cpp
index b95ff1796b4..38366b61271 100644
--- a/src/emu/save.cpp
+++ b/src/emu/save.cpp
@@ -196,7 +196,7 @@ void save_manager::save_memory(device_t *device, const char *module, const char
 		totalname = string_format("%s/%X/%s", module, index, name);
 
 	// insert us into the list
-	m_entry_list.emplace_back(std::make_unique<state_entry>(val, totalname.c_str(), device, module, tag ? tag : "", index, valsize, valcount, blockcount, stride));
+	m_entry_list.emplace_back(std::make_unique<state_entry>(val, totalname, device, module, tag ? tag : "", index, valsize, valcount, blockcount, stride));
 }
 
 
@@ -961,7 +961,7 @@ void rewinder::report_error(save_error error, rewind_operation operation)
 //  state_entry - constructor
 //-------------------------------------------------
 
-save_manager::state_entry::state_entry(void *data, const char *name, device_t *device, const char *module, const char *tag, int index, u8 size, u32 valcount, u32 blockcount, u32 stride)
+save_manager::state_entry::state_entry(void *data, std::string name, device_t *device, std::string module, std::string tag, int index, u8 size, u32 valcount, u32 blockcount, u32 stride)
 	: m_data(data)
 	, m_name(name)
 	, m_device(device)
diff --git a/src/emu/save.h b/src/emu/save.h
index f31e3762d5b..1bd3eb840ba 100644
--- a/src/emu/save.h
+++ b/src/emu/save.h
@@ -106,7 +106,7 @@ class save_manager
 	{
 	public:
 		// construction/destruction
-		state_entry(void *data, const char *name, device_t *device, const char *module, const char *tag, int index, u8 size, u32 valcount, u32 blockcount, u32 stride);
+		state_entry(void *data, std::string name, device_t *device, std::string module, std::string tag, int index, u8 size, u32 valcount, u32 blockcount, u32 stride);
 
 		// helpers
 		void flip_data();
diff --git a/src/mame/drivers/apc.cpp b/src/mame/drivers/apc.cpp
index 09b740343e7..57ccdff8e7a 100644
--- a/src/mame/drivers/apc.cpp
+++ b/src/mame/drivers/apc.cpp
@@ -116,7 +116,7 @@ private:
 	required_device_array<floppy_connector, 2> m_fdc_connector;
 	required_device<am9517a_device> m_dmac;
 	required_device<pit8253_device> m_pit;
-	required_shared_ptr<uint8_t> m_aux_pcg;
+	required_shared_ptr<uint16_t> m_aux_pcg;
 	uint8_t *m_char_rom;
 
 	required_device<speaker_device> m_speaker;
diff --git a/src/mame/drivers/armedf.cpp b/src/mame/drivers/armedf.cpp
index 1489c13abe4..50671c098ae 100644
--- a/src/mame/drivers/armedf.cpp
+++ b/src/mame/drivers/armedf.cpp
@@ -348,7 +348,7 @@ Notes:
 void armedf_state::terraf_io_w(offs_t offset, u16 data, u16 mem_mask)
 {
 	if (data & 0x4000 && ((m_vreg & 0x4000) == 0)) //0 -> 1 transition
-		m_nb1414m4->exec((m_text_videoram[0] << 8) | (m_text_videoram[1] & 0xff),m_text_videoram.target(),m_fg_scrollx,m_fg_scrolly,m_tx_tilemap);
+		m_nb1414m4->exec(m_text_videoram[0],(u8 *)m_text_videoram.target(),m_fg_scrollx,m_fg_scrolly,m_tx_tilemap);
 
 	COMBINE_DATA(&m_vreg);
 
@@ -654,7 +654,10 @@ void armedf_state::cclimbr2_soundmap(address_map &map)
 
 void armedf_state::blitter_txram_w(offs_t offset, u8 data)
 {
-	m_text_videoram[offset] = data;
+	if(offset & 1)
+		m_text_videoram[offset >> 1] = ((m_text_videoram[offset]) & 0xff00) | data;
+	else
+		m_text_videoram[offset >> 1] = ((m_text_videoram[offset]) & 0x00ff) | (data << 8);
 	if (offset < 0x1000)
 		m_tx_tilemap->mark_tile_dirty(offset & 0x7ff);
 }
diff --git a/src/mame/drivers/atarigt.cpp b/src/mame/drivers/atarigt.cpp
index 30fdeef7acd..da3df206077 100644
--- a/src/mame/drivers/atarigt.cpp
+++ b/src/mame/drivers/atarigt.cpp
@@ -648,7 +648,7 @@ void atarigt_state::main_map(address_map &map)
 	map(0xd79000, 0xd7a1ff).ram();
 	map(0xd7a200, 0xd7a203).ram().w(FUNC(atarigt_state::mo_command_w)).share("mo_command");
 	map(0xd7a204, 0xd7ffff).ram();
-	map(0xd80000, 0xdfffff).rw(FUNC(atarigt_state::colorram_protection_r), FUNC(atarigt_state::colorram_protection_w)).share("colorram");
+	map(0xd80000, 0xdfffff).rw(FUNC(atarigt_state::colorram_protection_r), FUNC(atarigt_state::colorram_protection_w));
 	map(0xe04000, 0xe04003).w(FUNC(atarigt_state::led_w));
 	map(0xe08000, 0xe08003).w(FUNC(atarigt_state::latch_w));
 	map(0xe0a000, 0xe0a003).w(FUNC(atarigt_state::scanline_int_ack_w));
diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h
index af41f5d4b82..bad8d49bde4 100644
--- a/src/mame/includes/armedf.h
+++ b/src/mame/includes/armedf.h
@@ -66,7 +66,7 @@ protected:
 	required_device<generic_latch_8_device> m_soundlatch;
 
 	// memory pointers
-	required_shared_ptr<u8> m_text_videoram;
+	required_shared_ptr<u16> m_text_videoram;
 	required_shared_ptr<u16> m_spr_pal_clut;
 	required_shared_ptr<u16> m_fg_videoram;
 	required_shared_ptr<u16> m_bg_videoram;
diff --git a/src/mame/includes/atarigt.h b/src/mame/includes/atarigt.h
index bf6bfb91a80..b72aaaf483b 100644
--- a/src/mame/includes/atarigt.h
+++ b/src/mame/includes/atarigt.h
@@ -26,7 +26,7 @@ public:
 	atarigt_state(const machine_config &mconfig, device_type type, const char *tag) :
 		atarigen_state(mconfig, type, tag),
 		m_palette(*this, "palette"),
-		m_colorram(*this, "colorram"),
+		m_colorram(*this, "colorram", 0x80000, ENDIANNESS_BIG),
 		m_adc(*this, "adc"),
 		m_playfield_tilemap(*this, "playfield"),
 		m_alpha_tilemap(*this, "alpha"),
@@ -40,7 +40,7 @@ public:
 
 	bool           m_is_primrage;
 	required_device<palette_device> m_palette;
-	required_shared_ptr<uint16_t> m_colorram;
+	memory_share_creator<uint16_t> m_colorram;
 
 	optional_device<adc0808_device> m_adc;