More protections against infinite liq loops