diff --git a/scripts/minimaws/lib/assets/common.js b/scripts/minimaws/lib/assets/common.js
index 7439aaa5a21..3b10b785fdd 100644
--- a/scripts/minimaws/lib/assets/common.js
+++ b/scripts/minimaws/lib/assets/common.js
@@ -1,5 +1,6 @@
 // license:BSD-3-Clause
 // copyright-holders:Vas Crabb
+'use strict';
 
 function make_collapsible(heading, section)
 {
diff --git a/scripts/minimaws/lib/assets/digest.js b/scripts/minimaws/lib/assets/digest.js
index 6739d1440d9..91285ff529f 100644
--- a/scripts/minimaws/lib/assets/digest.js
+++ b/scripts/minimaws/lib/assets/digest.js
@@ -1,5 +1,6 @@
 // license:BSD-3-Clause
 // copyright-holders:Vas Crabb
+'use strict';
 
 function Crc32Digester()
 {
diff --git a/scripts/minimaws/lib/assets/machine.js b/scripts/minimaws/lib/assets/machine.js
index b7f600f04d6..b488ae9e9a4 100644
--- a/scripts/minimaws/lib/assets/machine.js
+++ b/scripts/minimaws/lib/assets/machine.js
@@ -1,5 +1,6 @@
 // license:BSD-3-Clause
 // copyright-holders:Vas Crabb
+'use strict';
 
 var slot_info = Object.create(null);
 var bios_sets = Object.create(null);
diff --git a/scripts/minimaws/lib/assets/romident.js b/scripts/minimaws/lib/assets/romident.js
index 599b0674007..892894ced56 100644
--- a/scripts/minimaws/lib/assets/romident.js
+++ b/scripts/minimaws/lib/assets/romident.js
@@ -1,5 +1,6 @@
 // license:BSD-3-Clause
 // copyright-holders:Vas Crabb
+'use strict';
 
 var matched_names = new Array();
 var unmatched_names = new Array();
diff --git a/src/devices/cpu/drcbearm64.cpp b/src/devices/cpu/drcbearm64.cpp
index e0d58502996..8493e4b7106 100644
--- a/src/devices/cpu/drcbearm64.cpp
+++ b/src/devices/cpu/drcbearm64.cpp
@@ -4042,36 +4042,36 @@ void drcbe_arm64::op_and(a64::Assembler &a, const uml::instruction &inst)
 	}
 	else if (src1p.is_immediate() && is_valid_immediate_mask(src1p.immediate(), inst.size()))
 	{
-		const a64::Gp src2 = src2p.select_register(TEMP_REG1, inst.size());
+		const a64::Gp src2 = src2p.select_register(dst, inst.size());
 		mov_reg_param(a, inst.size(), src2, src2p);
 
 		a.emit(opcode, dst, src2, src1p.immediate());
 	}
 	else if (src2p.is_immediate() && is_valid_immediate_mask(src2p.immediate(), inst.size()))
 	{
-		const a64::Gp src1 = src1p.select_register(TEMP_REG1, inst.size());
+		const a64::Gp src1 = src1p.select_register(dst, inst.size());
 		mov_reg_param(a, inst.size(), src1, src1p);
 
 		a.emit(opcode, dst, src1, src2p.immediate());
 	}
 	else if ((inst.size() == 8) && src1p.is_immediate() && is_valid_immediate_mask(src1p.immediate(), 4) && (!inst.flags() || !BIT(src1p.immediate(), 31)))
 	{
-		const a64::Gp src2 = src2p.select_register(TEMP_REG1, inst.size());
+		const a64::Gp src2 = src2p.select_register(dst, inst.size());
 		mov_reg_param(a, inst.size(), src2, src2p);
 
 		a.emit(opcode, dst.w(), src2.w(), src1p.immediate());
 	}
 	else if ((inst.size() == 8) && src2p.is_immediate() && is_valid_immediate_mask(src2p.immediate(), 4) && (!inst.flags() || !BIT(src2p.immediate(), 31)))
 	{
-		const a64::Gp src1 = src1p.select_register(TEMP_REG1, inst.size());
+		const a64::Gp src1 = src1p.select_register(dst, inst.size());
 		mov_reg_param(a, inst.size(), src1, src1p);
 
 		a.emit(opcode, dst.w(), src1.w(), src2p.immediate());
 	}
 	else
 	{
-		const a64::Gp src1 = src1p.select_register(TEMP_REG1, inst.size());
-		const a64::Gp src2 = src2p.select_register(TEMP_REG2, inst.size());
+		const a64::Gp src1 = src1p.select_register(dst, inst.size());
+		const a64::Gp src2 = src2p.select_register(TEMP_REG1, inst.size());
 		mov_reg_param(a, inst.size(), src1, src1p);
 		mov_reg_param(a, inst.size(), src2, src2p);
 
diff --git a/src/lib/util/mfpresolve.h b/src/lib/util/mfpresolve.h
index 3c67cd543ff..eb3fba2b85d 100644
--- a/src/lib/util/mfpresolve.h
+++ b/src/lib/util/mfpresolve.h
@@ -75,7 +75,9 @@ inline std::pair<std::uintptr_t, std::uintptr_t> resolve_member_function(Ret (T:
 	}
 	else
 	{
-		return std::make_pair(std::uintptr_t(static_cast<void (*)()>(nullptr)), std::uintptr_t(nullptr));
+		return std::make_pair(
+				std::uintptr_t(static_cast<void (*)()>(nullptr)),
+				std::uintptr_t(static_cast<void *>(nullptr)));
 	}
 }
 
@@ -96,7 +98,9 @@ inline std::pair<std::uintptr_t, std::uintptr_t> resolve_member_function(Ret (T:
 	}
 	else
 	{
-		return std::make_pair(std::uintptr_t(static_cast<void (*)()>(nullptr)), std::uintptr_t(nullptr));
+		return std::make_pair(
+				std::uintptr_t(static_cast<void (*)()>(nullptr)),
+				std::uintptr_t(static_cast<void *>(nullptr)));
 	}
 }