Settings: fix issues