Fixes to Settings pages and related objects