Fixed root node issues