Buzz fixes 2