changes for gcc 4.7

Change-Id: I9f9e041a105b0a1fde830ed4f4900f083380f8d9

derp

Change-Id: I92e1bc3a5538b030a7af56e080277f4c796ea0dd
what is that

Change-Id: Ie8c93937b74b5710ecbc187e95fdb7859502d0f2