Fixes to contact form