Gurpreet|#2142| Minor updates based on Vinay feedback