fixes for announce and scrape