Fixing load performance issues