osx fixes [ci skip]