Some fixes to EQ.