Build fixes after the recent merge.