fix some final issues with 64bit stuff