Campaign Step 1 fixes