Autobuild fixes