Minor tweaks to try and launch on emulator.