walkthrough issue fixes