ADEN-1376 More CR fixes