Fix initial API and helpers.