Fixed some return issues.