Fixes for step 2