some fixes for WW estimation