Minor updates for 64-bit builds