Fix some gendarme warning messages