Fixes to formlayout code.