Fix small bugs for come back step