more osx fixes