Compile fixes for GCC 4.8 unter Ubuntu

Should now compile just fine.