Numerous small fixes to automation that should basically fix everything
that was wrong with the new system...