more blockfeed fixes