Even more fixes for GCC 4.8.2.