GCC 4.8 fixes

Siged-off-by: Paul Beeler <sparksco@gmail.com>