Fix isEquals and kill some warnings