Fixed loading issues