move some native-inputs into inputs