Correct Sonar Critical Violations (#80)
Correctness - Call to equals() comparing different types