GCC 4.8 fixups

Change-Id: I3277747ff90ec3f24fe30609df16468a01dd3376