Small fixes for step 1