Few minor changes and fixes