Small fixes to follow @marienfressinaud recommandations