[OPENENGSB-3845] Fix minor things according to PR feedback