Beam fixes