small fixes on return types