few tweaks to fix g++ warnings