[OPENENGSB-3761] fix review issues