Minor fixes in settings