Fix up for openssl changes