Shashank bugs fixed