Correct the remaining equals functions