Final tweaks for Beacon