Fixed some merge-bugs