BallJack fixes