finish changes for gcc 4.7 build