Some fixes with == and ===