Walkthrough 1 fixes