Fixes for peer web