Shashank | Fixed minor issues