Some cleanup, improving compound queue