Minor cleanups from coverage report