diff --git a/set_env.sh b/set_env.sh
index 65e91156666bd7c04f23a219ce882459002875f2..392e8cb4ca4dfc3c1d9f43bc15e6991bf00c86d9 100755
--- a/set_env.sh
+++ b/set_env.sh
@@ -13,6 +13,7 @@
 # Source set_env script from soctools_flow
 source soctools_flow/bin/project_setup.sh $@
 if [ ! -f .dma350_configured ]; then
+    cp nanosoc_tech/nanosoc/sldma350_tech/config/address_map_m1_nanosoc.sv $ARM_IP_LIBRARY_PATH/DMA-350/CG096-r0p0-00rel0/CG096-BU-50000-r0p0-00rel0/dma350/logical/models/modules/generic/address_map_m1_nanosoc.sv
     make -C nanosoc_tech/nanosoc/sldma350_tech/ config_dma_ahb
     touch .dma350_configured
 fi
\ No newline at end of file
diff --git a/system/src/accelerator_subsystem.v b/system/src/accelerator_subsystem.v
index 6cb2d42f704edf34ad20f3280efda98f917bf7a7..0957c7cbfd9fca47408e9b99607ffa56c68d7794 100644
--- a/system/src/accelerator_subsystem.v
+++ b/system/src/accelerator_subsystem.v
@@ -38,7 +38,7 @@ module accelerator_subsystem #(
   output wire   [1:0]              EXP_DRQ,
   input  wire   [1:0]              EXP_DLAST,
    // DMAC Stream interfaces
-`ifdef DMAC_1_DMA350
+`ifdef DMAC_DMA350
   input  wire                      EXP_STR_IN_0_TVALID,
   output wire                      EXP_STR_IN_0_TREADY,
   input  wire [SYS_DATA_W-1:0]     EXP_STR_IN_0_TDATA,