Fixed analysis tool issues due to box2d