Little fixes to allow the compilation