diff --git a/cJSON b/cJSON
index 460207f9c..8df81fb49 160000
--- a/cJSON
+++ b/cJSON
@@ -1 +1 @@
-Subproject commit 460207f9c09d501a2e302e5313b2f67dca0d6d63
+Subproject commit 8df81fb497cc48b089a57fcdc3a9933540ebc7c9
diff --git a/clibs b/clibs
index 48ddc013f..484fbf23e 160000
--- a/clibs
+++ b/clibs
@@ -1 +1 @@
-Subproject commit 48ddc013ffc2e7afb33b348bb605443896e55a28
+Subproject commit 484fbf23e34f6844f1c4e3f685bb6c53cadf5bfe
diff --git a/src/reports.c b/src/reports.c
index 5f8990c03..79a5c7eb7 100644
--- a/src/reports.c
+++ b/src/reports.c
@@ -1095,7 +1095,8 @@ void get_addresses(report_context * ctx)
                     faction *sf = visible_faction(ctx->f, u);
                     if (lastf != sf) {
                         if (u->building || u->ship || (stealthmod > INT_MIN
-                            && cansee(ctx->f, r, u, stealthmod))) {
+                            && visible_unit(u, ctx->f, stealthmod, seen_lighthouse)))
+                        {
                             add_seen_faction_i(&flist, sf);
                             lastf = sf;
                         }
diff --git a/storage b/storage
index f6254a3ce..0ef4b39e3 160000
--- a/storage
+++ b/storage
@@ -1 +1 @@
-Subproject commit f6254a3ce9d9671af32546b29099e563758140de
+Subproject commit 0ef4b39e39d8146d6ca323500a285c53843db988