Bug fixes

Signed-off-by: magnus <mfeuer@jaguarlandrover.com>