More autobuild fixes