More gcc 4.8 fixes

Signed-off-by: LaboDJ <jacopolabardi@gmail.com>