ADEN-1361 Code review fixes