Minor fixups

Few minor commits to address warnings and errors encountered building the tester and benchmark.