Initial updates for OpenSSL support