small refactorings and fixes

MIKE vollebregt requested to merge feat/small_fixes into develop Aug 16, 2022