Fixed 2 form issues.  #2033