[wip] Unbreak acceptance

We had a few build errors creep into the acceptance suite. I'm straightening them out presently.