upstream some more legacy N0R stuff