Fixing stuff after merge.