Queue can be cleared at any time, other minor fixes