Fix further bugs

Signed-off-by: niels <opensource21@gmail.com>