kannan-ar Bug fixes