Merge fixes

Signed-off-by: Lauri Kallioniemi <lauri.kallioniemi@frantic.com>