Emotion beam fixes