Corrects type of defaults.
Corrects defaults and canonicalisation.
Merge pull request #452 from LearningLocker/issue/conformance-ryan

Fixes defaults and canonicalisation.