Fixing request queue bugs