Fix more OSX compile errors