Settings: some fixes