Fixing some form issues.