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

Change-Id: Id934d6899dbae2a51b9f6cbe4cbd453d2e68516a