Fixes to hybrid queue for rare lockup from race condition.