fix compile errors from last merge which wasn't rebased