fixup botched rebase, 64bit fixes