Reviewed CR fixes