more tweaks to root node handling (for post M6 snapshot)