Fixed compile-errors on Mac. (Assumed c++11 default)