Fix root node creation