A few more small wire fixes