Merge "Make sure the root node has a type"