Fixed some minor return issues