Fix some recommandations