Shashank | Minor fixes