DNA Machine tweaks to fix runtimes for when the machine disappears

Really a fix on the commit from earlier, which I'm aware didn't work. I tested this extensively, works just fine.