A bit more cleanup around osx warnings