fixes for bison 3.0 (bison 2.7 works as well)