Some more tweaking

Signed-off-by: Philipp Stadler <philipp.stadler@me.com>