diff --git a/.Rbuildignore b/.Rbuildignore
index bfdc737..d3fc8df 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -29,4 +29,4 @@ src/osqp_sources/docs
 src/osqp_sources/site
 src/osqp_sources/tests
 src/osqp_sources/lin_sys/direct/qdldl/qdldl_sources/tests
-
+^configure$
diff --git a/DESCRIPTION b/DESCRIPTION
index 9006e46..fe504c8 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: osqp
 Title: Quadratic Programming Solver using the 'OSQP' Library
-Version: 0.6.3.2
-Date: 2023-10-19
+Version: 0.6.3.3
+Date: 2024-06-07
 Authors@R: c(
   person("Bartolomeo", "Stellato", role = c("aut", "ctb", "cph"),
          email = "bartolomeo.stellato@gmail.com"),
diff --git a/inst/58f00bd_fixes/make_fixes.R b/inst/0dd00a57_fixes/make_fixes.R
similarity index 79%
rename from inst/58f00bd_fixes/make_fixes.R
rename to inst/0dd00a57_fixes/make_fixes.R
index 42f8d15..2ec6afd 100644
--- a/inst/58f00bd_fixes/make_fixes.R
+++ b/inst/0dd00a57_fixes/make_fixes.R
@@ -55,22 +55,24 @@ replace_lines("osqp_sources/src/polish.c", 7, '#include "osqp_proj.h"')
 ## Fix proj.c
 replace_lines("osqp_sources/src/proj.c", 1, '#include "osqp_proj.h"')
 
+## We don't use CMAKE anymore, so not needed
 ## Fix CMakeLists.txt
-replace_lines("osqp_sources/include/CMakeLists.txt", 12, '    "${CMAKE_CURRENT_SOURCE_DIR}/osqp_proj.h"',
-              comment_prefix = "#")
+## replace_lines("osqp_sources/include/CMakeLists.txt", 12, '    "${CMAKE_CURRENT_SOURCE_DIR}/osqp_proj.h"',
+##               comment_prefix = "#")
 
-replace_lines("osqp_sources/lin_sys/direct/qdldl/qdldl_sources/CMakeLists.txt", 2, 'cmake_minimum_required (VERSION 3.5)',
-              comment_prefix = "#")
+## replace_lines("osqp_sources/lin_sys/direct/qdldl/qdldl_sources/CMakeLists.txt", 2, 'cmake_minimum_required (VERSION 3.5)',
+##               comment_prefix = "#")
 
-replace_lines("osqp_sources/CMakeLists.txt", 2, 'cmake_minimum_required (VERSION 3.5)',
-              comment_prefix = "#")
+## replace_lines("osqp_sources/CMakeLists.txt", 2, 'cmake_minimum_required (VERSION 3.5)',
+##               comment_prefix = "#")
 
 ## Drop lines 242-255  as they are not needed
 ## lines <- readLines("osqp_sources/CMakeLists.txt")[-(242:255)]
 ##writeLines(lines, "osqp_sources/CMakeLists.txt")
 
 ## Replace findR.cmake
-replace_lines("osqp_sources/configure/cmake/FindR.cmake", 11, 'find_program(R_EXEC NAMES R R.exe PATHS ${R_HOME}/bin)',
-              comment_prefix='#')
+
+## replace_lines("osqp_sources/configure/cmake/FindR.cmake", 11, 'find_program(R_EXEC NAMES R R.exe PATHS ${R_HOME}/bin)',
+##               comment_prefix='#')
 
 
diff --git a/src/Makevars b/src/Makevars
index c652fbe..f7bfe25 100644
--- a/src/Makevars
+++ b/src/Makevars
@@ -1,5 +1,5 @@
 OSQP_LIB_TARGET_DIR=./lib
-OSQP_INCLUDE_TARGET_DIR=./include/osqp/
+OSQP_INCLUDE_TARGET_DIR=./include/osqp
 OSQP_STATIC_LIB=$(OSQP_LIB_TARGET_DIR)/libosqp.a
 
 OSQP_FLAGS=-DR_LANG=TRUE
@@ -7,7 +7,7 @@ OSQP_FLAGS=-DR_LANG=TRUE
 PKG_CXXFLAGS=-I$(OSQP_INCLUDE_TARGET_DIR)
 PKG_LIBS=-L$(OSQP_LIB_TARGET_DIR) -losqp
 
-FIXES_SCRIPT=../inst/58f00bd_fixes/make_fixes.R
+FIXES_SCRIPT=../inst/0dd00a57_fixes/make_fixes.R
 
 ROBJECTS=osqp_solve_interface.o RcppExports.o
 OBJECTS=$(ROBJECTS)
@@ -30,7 +30,6 @@ $(OSQP_STATIC_LIB):
 		# a go at building the static library here.
 		echo "Making fixes to osqp_sources for CRAN"
 		$(R_HOME)/bin/Rscript $(FIXES_SCRIPT)
-		echo "No cmake?  I will try via osqp/Makefile"
 		cd osqp; \
 		$(MAKE) all CC="$(CC)" \
 		OSQP_FLAGS="$(OSQP_FLAGS)" \
diff --git a/src/Makevars.win b/src/Makevars.win
index 2228d4e..61f53ea 100644
--- a/src/Makevars.win
+++ b/src/Makevars.win
@@ -7,7 +7,7 @@ OSQP_FLAGS=-DR_LANG=TRUE
 PKG_CXXFLAGS=-I$(OSQP_INCLUDE_TARGET_DIR)
 PKG_LIBS=-L$(OSQP_LIB_TARGET_DIR) -losqp
 
-FIXES_SCRIPT=../inst/58f00bd_fixes/make_fixes.R
+FIXES_SCRIPT=../inst/0dd00a57_fixes/make_fixes.R
 
 ROBJECTS=osqp_solve_interface.o RcppExports.o
 OBJECTS=$(ROBJECTS)
@@ -30,7 +30,6 @@ $(OSQP_STATIC_LIB):
 		# a go at building the static library here.
 		echo "Making fixes to osqp_sources for CRAN"
 		$(R_HOME)/bin$(R_ARCH_BIN)/Rscript $(FIXES_SCRIPT)
-		echo "No cmake?  I will try via osqp/Makefile"
 		cd osqp; \
 		$(MAKE) all CC="$(CC)" \
 		OSQP_FLAGS="$(OSQP_FLAGS)" \