Fill some gaps in comparison code