Review fixes
Review fixes

mikefero/ccm,bcantoni/ccm,pcmanus/ccm,mikefero/ccm,pcmanus/ccm,thobbs/ccm,mike-tr-adamson/ccm,thobbs/ccm,mike-tr-adamson/ccm,tolbertam/ccm,tolbertam/ccm,mike-tr-adamson/ccm,pcmanus/ccm,bcantoni/ccm