misc cleanups so unit tests compile