Fixes in settings