Small changes to fix g++ warnings