Fixes for 64-bit simulator