fix a few issues holding up tests.