Fixed some return types.