compiler warning cleanup
benchmark improvements