* Few minor changes