More fixes for standards.