More source code tweaking.
Signed-off-by: Manuel Bachmann <manuel.bachmann@open.eurogiciel.org>