Fixed gendarme warnings.