Minor updates to peer and server modules