sigh, fix again
Fix flex/bison interaction properly