multiple CR fixes