Updates for ALPN support