OC-208: Changes from comments