fixing some loading issues