fixups for build 64/32