Fixed Load and Unload issues