Fixes for form2.