fixes for String and Equality