Fix Gendarme defects