Few minor changes