Fix g++ compliations problems (didn't show on clang)