Changes to make compatible with API application changes.