ADEN-1347 Code Review fixes