Buzzer fixes