Some fixes to ww_2