Fixed more issues with destroy()