ADEN-62 ADEN-63 fixes after code review