Fixed problems with settings