diff --git a/lib/activate/activate.c b/lib/activate/activate.c
index b3439adba..670b85c08 100644
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -794,6 +794,7 @@ int lv_raid_dev_health(const struct logical_volume *lv, char **dev_health)
 	int r;
 	struct dev_manager *dm;
 	struct dm_status_raid *status;
+	/* FIXME: find a better way for this, it is fragile */
 	static char *cached_dev_health = NULL;
 	static const struct logical_volume *cached_lv = NULL;
 
diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c
index 2846cafd9..bb50ae4d8 100644
--- a/lib/device/dev-io.c
+++ b/lib/device/dev-io.c
@@ -437,6 +437,8 @@ int dev_open_flags(struct device *dev, int flags, int direct, int quiet)
 		}
 
 		dev_close_immediate(dev);
+		// FIXME: dev with DEV_ALLOCED is released
+		// but code is referencing it
 	}
 
 	if (critical_section())