applying missing CR fixes