Trying to fix the tooling api stuff.