Few fixes after the merge.