diff --git a/src/devices/cpu/mips/r4000.cpp b/src/devices/cpu/mips/r4000.cpp
index 53052ebd14a..e2b090e9d1b 100644
--- a/src/devices/cpu/mips/r4000.cpp
+++ b/src/devices/cpu/mips/r4000.cpp
@@ -84,8 +84,8 @@
 #define CAUSE      m_cp0[CP0_Cause]
 
 DEFINE_DEVICE_TYPE(R4000, r4000_device, "r4000", "MIPS R4000")
-DEFINE_DEVICE_TYPE(R4400, r4400_device, "r4400", "MIPS R4000")
-DEFINE_DEVICE_TYPE(R4600, r4600_device, "r4600", "QED R4000")
+DEFINE_DEVICE_TYPE(R4400, r4400_device, "r4400", "MIPS R4400")
+DEFINE_DEVICE_TYPE(R4600, r4600_device, "r4600", "QED R4600")
 
 r4000_base_device::r4000_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u32 prid, cache_size_t icache_size, cache_size_t dcache_size)
 	: cpu_device(mconfig, type, tag, owner, clock)
diff --git a/src/mame/machine/sgi.h b/src/mame/machine/sgi.h
index 56a08eb4496..73eb68561cd 100644
--- a/src/mame/machine/sgi.h
+++ b/src/mame/machine/sgi.h
@@ -27,7 +27,13 @@ public:
 		m_eeprom.set_tag(std::forward<U>(eeprom_tag));
 		m_hpc3.set_tag(std::forward<V>(hpc3_tag));
 	}
-
+	template <typename T, typename U>
+	sgi_mc_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&cpu_tag, U &&eeprom_tag)
+		: sgi_mc_device(mconfig, tag, owner, (uint32_t)0)
+	{
+		m_maincpu.set_tag(std::forward<T>(cpu_tag));
+		m_eeprom.set_tag(std::forward<U>(eeprom_tag));
+	}
 	sgi_mc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	DECLARE_READ32_MEMBER(read);
@@ -51,7 +57,7 @@ private:
 
 	required_device<cpu_device> m_maincpu;
 	required_device<eeprom_serial_93cxx_device> m_eeprom;
-	required_device<hpc3_device> m_hpc3;
+	optional_device<hpc3_device> m_hpc3;
 
 	address_space *m_space;