[64BIT] Simple changes