A few conduwuit fixes

We've been running these off of my local checkout for the past couple of days, and it's fixed a number of conduwuit issues.