Updated config file update code.
Fixed extra data dir entries.