Few small changes!