Fix PEAR CGL violations