Some minor fixes
Merge pull request #2997 from WouterJ/fix_form_component

Fixes for Form Component chapter