Minor automation changes