Setup:last fixes to autobuild