Build cleanup

64-bit is still busted, but this is needed to compile.