More GCC-4.8 compiling fixes