Minor bugs

and some pointless comparisons