bug fixes

Signed-off-by: drgorb <micha.roon@managination.com>