ADEN-600 Code review fixes