changes for gcc 4.7