Fixed minor loading issues