Fix API and specs.