Again some stuff

Signed-off-by: Jani Sinervo <jani.sinervo@gmail.com>