Minor Event Preparation Changes