bug fixes

Signed-off-by: umagar <tobias_kristiansen@hotmail.com>