Shotgun bug fixes to NativeLauncher