Fixed unload issues