Minor fixes and tweaks trying to get the iOS version running.