[[ Linux64 ]] Some more 64-bit cleanliness fixes