akshay-ap Minor updates