C++11 starting files tweak from Johan