Fix some settings stuff