Some fixes for the 5th step