Hotfixes for destruction