Bug fixes and Bison collisions update