Contact form fixes