Fix references in Scan for RootHandler