fixes after repos merge.