Fix a couple return type issues.