- Small improvements by Klaus Peter

Signed-off-by: Markus Germann <MarkusGermann>