fix some kf6 todos

Merged Waqar Ahmed requested to merge work/kf6-todos into master

Merge request reports