Some updates for 64 bit