More Step 2 fixes.