Some fixes to automation...