diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a82005..7e9d19b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,13 +89,7 @@ endif()
 # Add code
 add_subdirectory(src)
 
-# Include generated headers
-target_include_directories(${DUSK_TARGET_NAME} PUBLIC
-  ${DUSK_GENERATED_HEADERS_DIR}
-)
-
 # Build assets
-# message(FATAL_ERROR "Building assets for game: ${DUSK_ASSETS}")
 add_custom_target(DUSK_ASSETS_BUILT ALL
   COMMAND
     ${Python3_EXECUTABLE} ${DUSK_TOOLS_DIR}/assetstool/main.py
@@ -103,12 +97,16 @@ add_custom_target(DUSK_ASSETS_BUILT ALL
       --build-type wad
       --output-assets ${DUSK_BUILT_ASSETS_DIR}
       --output-file ${DUSK_BUILD_DIR}/dusk.dsk
-      --output-headers ${DUSK_GENERATED_HEADERS_DIR}/asset/assetbundle.h
       --headers-dir ${DUSK_GENERATED_HEADERS_DIR}
       --input ${DUSK_ASSETS}
 )
 add_dependencies(${DUSK_TARGET_NAME} DUSK_ASSETS_BUILT)
 
+# Include generated headers
+target_include_directories(${DUSK_TARGET_NAME} PUBLIC
+  ${DUSK_GENERATED_HEADERS_DIR}
+)
+
 # Postbuild
 if(DUSK_TARGET_SYSTEM STREQUAL "psp")
   create_pbp_file(
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index c03bd04..0ef1273 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -8,7 +8,7 @@ function(add_asset ASSET_TYPE ASSET_PATH)
   set(FULL_ASSET_PATH "${CMAKE_CURRENT_LIST_DIR}/${ASSET_PATH}")
   string(JOIN "%" ASSETS_ARGS ${ARGN})
   list(APPEND DUSK_ASSETS
-    "${ASSET_TYPE}#${FULL_ASSET_PATH}#${ASSETS_ARGS}$"
+    "${ASSET_TYPE}#${FULL_ASSET_PATH}#${ASSETS_ARGS}"
   )
   set(DUSK_ASSETS ${DUSK_ASSETS} CACHE INTERNAL ${DUSK_CACHE_TARGET})
 endfunction()
\ No newline at end of file
diff --git a/tools/assetstool/args.py b/tools/assetstool/args.py
index 65cce94..db7e529 100644
--- a/tools/assetstool/args.py
+++ b/tools/assetstool/args.py
@@ -21,7 +21,6 @@ for inputArg in args.input:
       continue
     
     pieces = file.split('#')
-    print(f"Input arg: {pieces}")
 
     if len(pieces) < 2:
       print(f"Error: Invalid input asset format '{file}'. Expected format: type#path[#option1%option2...]")
@@ -39,7 +38,7 @@ for inputArg in args.input:
           options[partSplit[0]] = partSplit[1]
         else:
           options[partSplit[0]] = True
-          
+    
     inputAssets.append({
       'type': pieces[0],
       'path': pieces[1],