YAHOO-259 -- QE little changes after review