More peer fixes