Better fixes for g++ warnings