build fixes after the merge