a smattering of fixes during today's tests