Fixed more loading issues