Fixed some issues with the merge messing up