Setting Fixes
Merge pull request #497 from sandal-smuggler/Setting-Fix-01.02

Setting Fixes