Settings bugfixes