Settings: Some fixes