4.8 GCC fixes

Change-Id: If8f95e0c79741d7b1f50d2d22548e81851d81d0d