Compile fixes for gcc 4.8 on Linux