Server and SSL improvements