Fix up starred API