Fixed use of iterator from wrong dataset
Added missing override annotations