cleanups for ios and osx support