Fix ball bugs