Fix some more purge corner cases