Fix for add_peer
Fix annotate counter
Merge pull request #491 from NielsZeilemaker/sp_add_peer_fix

Fix for add_peer