Fixed some small issues when re-loading settings.