Still more 64-bit patches