Minor OSX fixes