More CR fixes