Fixed some settings stuff