finishing a few autobuild things