More compilation fixes for OSX with gcc-4.8