Speculatively fix queue issues