Could you fix these equals() methods to properly implement equals()?