auto_build: Minor bugfix and cleanup