Minor changes to Piece and NeighborPeer