ADEN-1154 Code review fixes