KF5 Attica: Fix issues from review