Minor fixes after merge.