OSX and C++11 fixes