diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5fd97de..362656f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.13)
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 20)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-volatile")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-volatile")
 
 # Initialise pico_sdk from installed location
 # (note this can come from environment, CMake cache etc)
@@ -14,7 +14,6 @@ include("cmake/pico_sdk_import.cmake")
 
 project(gbmanager VERSION "1.0.0" LANGUAGES C CXX ASM)
 
-
 # Initialise the Raspberry Pi Pico SDK
 pico_sdk_init()
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index aa0b90d..bdddc2f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,5 @@
-configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h.in ${PROJECT_BINARY_DIR}/src/config.h)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+configure_file(${CMAKE_CURRENT_LIST_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
 set(SOURCES
     gbmanager.cpp
@@ -20,8 +21,6 @@ else()
     pico_enable_stdio_usb(${CMAKE_PROJECT_NAME} 0)
 endif()
 
-pico_generate_pio_header(${CMAKE_PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/ds18b20.pio)
-
 # Add the standard library to the build
 target_link_libraries(${CMAKE_PROJECT_NAME} pico_stdlib pico_one_wire)