Fixed some code at the peers