Minor modifications for g++ 4.8