Fixing of some problems from the merge.