Fixing stuff for OSX, add C++14 support.