Tempest In A Teapot: Bug fixes

Bug fixes in the settings.