Minor changes to get building on Linux with g++.