BUG-648: Fixup hashCode/equals