Various bits of cleanup to unbreak mounting