buzz() fixes from buildrob