Merge "Fixed typos in API and minor cleanup" into nyc-dev