Fixes after merge.