ADEN-19 Next fixes for comments