Freeze fixes
Merge pull request #1098 from Fuzzysqurl/dustox

Freeze fixes