Merge "Fix a few incorrect return codes."