A few changes to WireIt