fixes for existing peers