Fix create and rewire functions.