Fixed some syntax from the merge