Fixes after video walkthrough