Fixed some issues in settings