gcc4.9.x fix up