changes for gcc 4.7

Change-Id: I9f9e041a105b0a1fde830ed4f4900f083380f8d9