exit criteria fixes