Do a little less work in auto.sh
:lipstick:
dirty hacks to not blow up other DEBUG things, if we can avoid it