Fixed some post-merge conflicts