Core Review fixes