Some corrections to the Build API

And some things are still broken