ADEN-419 fixes after cr