fixes to peershandler