Hotfixes for destruction
Merge pull request #81 from wiredearp/master

Hotfixes