more 64bit fixes