Updates for 64-bit builds