GCC 4.8/4.9 fixes

Change-Id: I3e725a6a9221d5e4974c15f270a1c2a29beeef3b
Signed-off-by: iceandfire <arhamjamal@gmail.com>