More tweaks for standards.