Fixing some contact form issues