Fix lingering ents