Fixes for the auto-init/deinit code based on review comments
Reviewed-by: NRichard Levitte <levitte@openssl.org>