Bug fixes, Collision checking