Fixed some settings