Fix GCC 4.8 compatability

Change-Id: Id8c3956ee8ba0d91b214e3bcd04b69a580aaea23