Fixes for peers initializer