Fix issues with Bison 3.0