More gcc 4.8 fixes

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