Defog fixes
Merge pull request #1122 from Fuzzysqurl/defog

Defog fixes