Beacon fixes