Fixed some loading issues