More libcorkscrew fixes for GCC 4.8+