Compile fixes for GCC 4.8 under Ubuntu 14.02 LTS