Fixes to smtp_server