YAHOO-234 -- QE little changes after review