Fix various recommandations