Fixat lite mer c++11 syntax