Add support for dynamically-learnt peer identities
Fix build