Settings and error fixes