internal CR fixes