Fixed some corruption from last merge conflict