changes for 0.6.1 and makin jison dependencies happy for now