Fixed some return types