More step 2 fixes