Bugfixes after merge.