Prepare GCC 4.8 support