Changes: cleanup and corrections for autobuilder