Fixes cube, scheduler and queue