Few minor yet important changes