diff --git a/SheepShaver/src/rsrc_patches.cpp b/SheepShaver/src/rsrc_patches.cpp
index 5f692289..4682e42a 100644
--- a/SheepShaver/src/rsrc_patches.cpp
+++ b/SheepShaver/src/rsrc_patches.cpp
@@ -31,6 +31,7 @@
 #include "rom_patches.h"
 #include "main.h"
 #include "audio.h"
+#include "audio_defs.h"
 #include "thunks.h"
 
 #define DEBUG 0
@@ -448,14 +449,15 @@ void CheckLoad(uint32 type, int16 id, uint16 *p, uint32 size)
 
 	} else if (type == FOURCC('t','h','n','g')) {
 		// Collect info about used audio sifters
-		uint32 c_type = ntohl(0[(uint32 *)p]);
-		uint32 sub_type = ntohl(1[(uint32 *)p]);
+		uint32 thing = (uintptr)p;
+		uint32 c_type = ReadMacInt32(thing);
+		uint32 sub_type = ReadMacInt32(thing + 4);
 		if (c_type == FOURCC('s','d','e','v') && sub_type == FOURCC('s','i','n','g')) {
-			1[(uint32 *)p] = htonl(FOURCC('a','w','g','c'));
+			WriteMacInt32(thing + 4, FOURCC('a','w','g','c'));
 			D(bug("thng %d, type %c%c%c%c (%08x), sub type %c%c%c%c (%08x), data %p\n", id, c_type >> 24, (c_type >> 16) & 0xff, (c_type >> 8) & 0xff, c_type & 0xff, c_type, sub_type >> 24, (sub_type >> 16) & 0xff, (sub_type >> 8) & 0xff, sub_type & 0xff, sub_type, p));
-			AddSifter(ReadMacInt32(((uintptr)p)+20), ntohs(p[12]));
-			if (ntohs(p[28]))							// componentPFCount
-				AddSifter(ReadMacInt32(((uintptr)p)+62), ntohs(p[33]));
+			AddSifter(ReadMacInt32(thing + componentResType), ReadMacInt16(thing + componentResID));
+			if (ReadMacInt32(thing + componentPFCount))
+				AddSifter(ReadMacInt32(thing + componentPFResType), ReadMacInt16(thing + componentPFResID));
 		}
 
 	} else if (type == FOURCC('s','i','f','t') || type == FOURCC('n','i','f','t')) {