Update for upstream changes & fix typos. Require API version 1.4