Beacon cleanups.
Repair damages from b631232ac87eb95607ef15db167113a98d4c558b