FileOffer fixes