Add the bundled api jar. Fix some usages.