Some fixes to improve cleanness