Bugfixes related to reloading config