Changed some return types

Signed-off-by: Hendrik Jonas Meyer <h.meyer@bigpoint.net>