fixes with special equals
Merge branch 'Jonte'