Various fixes

Signed-off-by: stefanlind <stefan.lind@esss.se>