ADEN-19 fixes after comments