Changes from @jkudish and @justinshreve on the REST API.