Small fixes to comparison and construction