Make Changes more standards-compliant