tweaks to conform to new standards