Fixed runaway publoops and cleanup stability