fixes after merge.