Prep work for GCC 4.8

Signed-off-by: Anthony <Disciple3603@gmail.com>