More standards cleaning to fix some of the warnings.