started on 64-bit fixes