additional CR fixes