diff --git a/cmake/libwebsockets-config.cmake.in b/cmake/libwebsockets-config.cmake.in
index 19e270443..b91c58e53 100644
--- a/cmake/libwebsockets-config.cmake.in
+++ b/cmake/libwebsockets-config.cmake.in
@@ -18,7 +18,13 @@ endif()
 include(${LWS_CMAKE_DIR}/LwsCheckRequirements.cmake)
 
 # IMPORTED targets from LibwebsocketsTargets.cmake
-set(LIBWEBSOCKETS_LIBRARIES websockets websockets_shared)
+set(LIBWEBSOCKETS_LIBRARIES)
+if (TARGET websockets)
+	set(LIBWEBSOCKETS_LIBRARIES ${LIBWEBSOCKETS_LIBRARIES} websockets)
+endif()
+if (TARGET websockets_shared)
+	set(LIBWEBSOCKETS_LIBRARIES ${LIBWEBSOCKETS_LIBRARIES} websockets_shared)
+endif()
 
 if (TARGET websockets_shared)
 	set(websockets_shared 1)
diff --git a/lib/secure-streams/serialized/client/sspc-transport.c b/lib/secure-streams/serialized/client/sspc-transport.c
index 339a27cf7..4db6f6b78 100644
--- a/lib/secure-streams/serialized/client/sspc-transport.c
+++ b/lib/secure-streams/serialized/client/sspc-transport.c
@@ -191,6 +191,7 @@ lws_sspc_txp_event_closed(lws_transport_priv_t priv)
 		r = h->ssi.state(ss_to_userobj(h), NULL,
 					 LWSSSCS_DISCONNECTED, 0);
 	}
+	h->creating_cb_done = 0;
 	if (r != LWSSSSRET_DESTROY_ME)
 		/*
 		 * schedule a reconnect in 1s
diff --git a/minimal-examples-lowlevel/secure-streams/minimal-secure-streams-testsfail/minimal-secure-streams-testsfail.c b/minimal-examples-lowlevel/secure-streams/minimal-secure-streams-testsfail/minimal-secure-streams-testsfail.c
index acc87b99f..98bc757f0 100644
--- a/minimal-examples-lowlevel/secure-streams/minimal-secure-streams-testsfail/minimal-secure-streams-testsfail.c
+++ b/minimal-examples-lowlevel/secure-streams/minimal-secure-streams-testsfail/minimal-secure-streams-testsfail.c
@@ -427,7 +427,7 @@ static const char * const default_ss_policy =
 			"\"tls\": true,"
 			"\"nghttp2_quirk_end_stream\": true,"
 			"\"h2q_oflow_txcr\": true,"
-			"\"timeout_ms\": 3000,"
+			"\"timeout_ms\": 5000,"
 			"\"retry\": \"default\","
 			"\"tls_trust_store\": \"le_via_isrg\""
                 "}}"
@@ -591,19 +591,19 @@ struct tests_seq {
 
 	{
 		"h1:badcert_hostname",
-		"badcert_hostname", 6 * LWS_US_PER_SEC, LWSSSCS_ALL_RETRIES_FAILED,
+		"badcert_hostname", 35 * LWS_US_PER_SEC, LWSSSCS_ALL_RETRIES_FAILED,
 		(1 << LWSSSCS_QOS_NACK_REMOTE),
 		0
 	},
 	{
 		"h1:badcert_expired",
-		"badcert_expired", 6 * LWS_US_PER_SEC, LWSSSCS_ALL_RETRIES_FAILED,
+		"badcert_expired", 35 * LWS_US_PER_SEC, LWSSSCS_ALL_RETRIES_FAILED,
 		(1 << LWSSSCS_QOS_NACK_REMOTE),
 		0
 	},
 	{
 		"h1:badcert_selfsigned",
-		"badcert_selfsigned", 6 * LWS_US_PER_SEC, LWSSSCS_ALL_RETRIES_FAILED,
+		"badcert_selfsigned", 35 * LWS_US_PER_SEC, LWSSSCS_ALL_RETRIES_FAILED,
 		(1 << LWSSSCS_QOS_NACK_REMOTE),
 		0
 	},
@@ -737,7 +737,8 @@ myss_state(void *userobj, void *sh, lws_ss_constate_t state,
 	case LWSSSCS_CONNECTING:
 	case LWSSSCS_CREATING:
 		if (state == LWSSSCS_CREATING) {
-			m->start_us = lws_now_usecs();
+			if (!m->start_us)
+				m->start_us = lws_now_usecs();
 			lws_ss_start_timeout(m->ss,
 				(unsigned int)(curr_test->timeout_us / LWS_US_PER_MS));
 		} else {