Minor fixes on iOS/OS X