More build mods
More crc fixups even though algo is b0rked