Some changes will trying to get emulators to run on Mac