Adaptations to allow latest Accord changes to build.