YAHOO-218 -- QE little changes after review