Fixed some return types
Fixed return types