CR Fixes / comments