Even less deprecation
Fix Settings defaults

These shouldn't really be called anyway but...
Merge pull request #823 from Morphan1/master

Deprecate deprecated deprecation calls to deprecated methods