YAHOO-214 -- QE little changes after review