Chnages requested by compiler for 64-bit transition