diff --git a/src/Makevars b/src/Makevars
index 3abe619..36f3240 100644
--- a/src/Makevars
+++ b/src/Makevars
@@ -1,7 +1,6 @@
 ## Use the R_HOME indirection to support installations of multiple R version
 ## PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"` $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
-PKG_LIBS =  $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) $(SHLIB_OPENMP_CFLAGS)
-PKG_CFLAGS = $(SHLIB_OPENMP_CFLAGS)
+PKG_LIBS =  $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)  $(SHLIB_OPENMP_CXXFLAGS)
 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
 
 ## As an alternative, one can also add this code in a file 'configure'
diff --git a/src/Makevars.win b/src/Makevars.win
index f7c6650..ae9cac3 100644
--- a/src/Makevars.win
+++ b/src/Makevars.win
@@ -1,6 +1,5 @@
 
 ## Use the R_HOME indirection to support installations of multiple R version
 ## PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()") $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
-PKG_LIBS =  $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) $(SHLIB_OPENMP_CFLAGS)
-PKG_CFLAGS = $(SHLIB_OPENMP_CFLAGS)
+PKG_LIBS =  $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) $(SHLIB_OPENMP_CXXFLAGS)
 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
\ No newline at end of file
diff --git a/tests/testthat/test_Rtsne.R b/tests/testthat/test_Rtsne.R
index 2248d1f..e1cd3f3 100644
--- a/tests/testthat/test_Rtsne.R
+++ b/tests/testthat/test_Rtsne.R
@@ -19,6 +19,9 @@ test_that("Scaling gives the expected result", {
 
 test_that("Manual distance calculation equals C++ distance calculation", {
   
+  # Does not work on 32 bit windows
+  skip_on_cran()
+  
   # Exact
   set.seed(50)
   tsne_matrix <- Rtsne(as.matrix(iris_unique[,1:4]),verbose=FALSE, 
@@ -75,6 +78,9 @@ test_that("Accepts data.frame", {
 
 test_that("OpenMP with different threads returns same result",{
   
+  # Does not work on windows
+  skip_on_cran()
+  
   set.seed(50)
   tsne_out_df1 <- Rtsne(iris_unique[,1:4],dims=3,verbose=FALSE, is_distance = FALSE,
                        theta=0.1,pca=FALSE,max_iter=iter_equal,num_threads=1)