Changes to make the code POC7 compliant.