Another round of fixes to automation...  A few more still forthcoming...
Prevent unitialized memory error...