Fix up some warnings

This fixes some warnings that our test suite is spewing.