diff --git a/include/libwebsockets/lws-lejp.h b/include/libwebsockets/lws-lejp.h
index 98bce344f..ddeb4595a 100644
--- a/include/libwebsockets/lws-lejp.h
+++ b/include/libwebsockets/lws-lejp.h
@@ -178,16 +178,16 @@ LWS_EXTERN signed char _lejp_callback(struct lejp_ctx *ctx, char reason);
 typedef signed char (*lejp_callback)(struct lejp_ctx *ctx, char reason);
 
 #ifndef LEJP_MAX_PARSING_STACK_DEPTH
-#define LEJP_MAX_PARSING_STACK_DEPTH 5
+#define LEJP_MAX_PARSING_STACK_DEPTH 8
 #endif
 #ifndef LEJP_MAX_DEPTH
-#define LEJP_MAX_DEPTH 12
+#define LEJP_MAX_DEPTH 16
 #endif
 #ifndef LEJP_MAX_INDEX_DEPTH
-#define LEJP_MAX_INDEX_DEPTH 8
+#define LEJP_MAX_INDEX_DEPTH 12
 #endif
 #ifndef LEJP_MAX_PATH
-#define LEJP_MAX_PATH 128
+#define LEJP_MAX_PATH 192
 #endif
 #ifndef LEJP_STRING_CHUNK
 /* must be >= 30 to assemble floats */
diff --git a/lib/tls/CMakeLists.txt b/lib/tls/CMakeLists.txt
index 7b5b5676f..559be9abb 100644
--- a/lib/tls/CMakeLists.txt
+++ b/lib/tls/CMakeLists.txt
@@ -289,6 +289,7 @@ if (LWS_WITH_SSL)
 		if (NOT LWS_WITH_MBEDTLS)
 			# older (0.98) Openssl lacks this
 			set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENSSL_INCLUDE_DIRS} PARENT_SCOPE)
+			set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENSSL_INCLUDE_DIRS})
 			check_include_file(openssl/ecdh.h LWS_HAVE_OPENSSL_ECDH_H)
 
 			if (LWS_SSL_SERVER_WITH_ECDH_CERT AND NOT LWS_HAVE_OPENSSL_ECDH_H)