Minor changes to SolidFire automation-related code