Corrected comparison type leaks