Fixes to make the horizontal form sample work