More work on 64 bit support