Settings: Fix a few small bugs