minor tweaks reacting to new g++ warnings settings