more CR fixes