Fix up errors with API