Fix compilation issues (NT2, Clang,...)