diff --git a/code/nrf-connect/samples/input/prj.conf b/code/nrf-connect/samples/input/prj.conf
index 243e054..cef2c65 100644
--- a/code/nrf-connect/samples/input/prj.conf
+++ b/code/nrf-connect/samples/input/prj.conf
@@ -7,8 +7,6 @@ CONFIG_GPIO=y
 CONFIG_CBPRINTF_FP_SUPPORT=y
 
 CONFIG_SERIAL=n
-CONFIG_PM=y
-CONFIG_PM_DEVICE=y
 
 CONFIG_USE_SEGGER_RTT=y
 
diff --git a/code/nrf-connect/samples/zigbee/src/flash_fs.c b/code/nrf-connect/samples/zigbee/src/flash_fs.c
index 01e72f5..ae45a8b 100644
--- a/code/nrf-connect/samples/zigbee/src/flash_fs.c
+++ b/code/nrf-connect/samples/zigbee/src/flash_fs.c
@@ -12,7 +12,7 @@ FS_LITTLEFS_DECLARE_DEFAULT_CONFIG(storage);
 static struct fs_mount_t lfs_storage_mnt = {
     .type = FS_LITTLEFS,
     .fs_data = &storage,
-    .storage_dev = (void *)FLASH_AREA_ID(storage),
+    .storage_dev = (void *)FIXED_PARTITION_ID(storage_partition),
     .mnt_point = "/lfs",
 };