Helper fixes + Persist Queue manager (not quite done)