Various fixes after Autobuild transition