EQ_Notice: Cleanup and a fix or two