Ooops I should really test that making changes for 64-bit doesn't break 32-bit builds heh