ADEN-922 cr fixes after Rychu's comments