Small OSX fixes