Fix gendarme reported issues