Fix iterator cpp check warnings