Some contact form issues fixed