Maybe fix some conducts (9218, 9216)

Still a huge mess.