Corrections for gcc 4