Lightning + XFrame fixes