Addressing warnings
More addressing of warnings
Corrected automated stuff
More automation corrections