.
Fixes to legacy peer support.