Fix some automation regressions