GCC 4.8 Cleanup

Signed-off-by: Cerebro <zarboz@gmail.com>