Fixes for existing peers