More Fixes for form