Changes from labodj to boot with GCC 4.8

Signed-off-by: kecinzer <kecinzer@gmail.com>