minor changes for g++ 4.7 compile