gcc 4.6 corrections