dont commit out other fixes for WCE