Cleanup errors from upstream review, cleanup typeographical errors.