Fixed some form issues