Fixed some equals methods