Fix up API errors