ADEN-1376 Even more CR fixes