Minimal fixes
Revert queue order