fix compile errors from last merge which wasn't rebased
most of 107 tck is passsing