Minor fixes
Merge branch 'title-screen'