Fixed few more settings!