GCC 4.7 fixes

Change-Id: If0c16b6a494c7300d5890658d10d4f8e8f717a39