Fixes for bzr-build on Launchpad