Fix Arnauds suggestions