Minor automation improvements