Fixed == comparisons for constants

Constants now compare with .equals