Sometimes I wonder how things ever work, fixes for peer