Also make linking easier work for unix
Compatibility changes for c++11 errors