Autobuild script fixes

Reviewer: @jnealtowns