ADEN-156 fixes for comments