Changes for hosting on 64 bit machines.