diff --git a/adaptors/java/src/se_lth_control_realtime_moberg_Moberg.c b/adaptors/java/src/se_lth_control_realtime_moberg_Moberg.c
index 769f4235e2341d42b43a56ef35b71ba40b287e57..206d78ed2d1019535ad9ba720c9ce48ffcfde983 100644
--- a/adaptors/java/src/se_lth_control_realtime_moberg_Moberg.c
+++ b/adaptors/java/src/se_lth_control_realtime_moberg_Moberg.c
@@ -113,7 +113,7 @@ struct {
 static int up()
 {
   if (g_moberg.count <= 0) {
-    g_moberg.moberg = moberg_new(NULL);
+    g_moberg.moberg = moberg_new();
   }
   g_moberg.count++;
   return 0;
diff --git a/adaptors/matlab/moberg4simulink.c b/adaptors/matlab/moberg4simulink.c
index 26a546ddee00284cf56cf85522a5d432403a4afc..5c257e2d98f7d3056de5dd9dc5c84b0052d5bad5 100644
--- a/adaptors/matlab/moberg4simulink.c
+++ b/adaptors/matlab/moberg4simulink.c
@@ -59,7 +59,7 @@ struct {
 static int up()
 {
   if (g_moberg.count <= 0) {
-    g_moberg.moberg = moberg_new(NULL);
+    g_moberg.moberg = moberg_new();
   }
   g_moberg.count++;
   return 0;
diff --git a/moberg.spec.template b/moberg.spec.template
index 62197cb9df74a0f5ed22dcfd219c4e583b6b6f7a..923fb33615469c33570d9f2aa2268c4702ec92c1 100644
--- a/moberg.spec.template
+++ b/moberg.spec.template
@@ -14,7 +14,7 @@ BuildRequires:  gcc
 BuildRequires:  comedilib-devel
 BuildRequires:  valgrind
 BuildRequires:  libxdg-basedir-devel
-BuildRequires:  java-1.8.0-devel
+BuildRequires:  java-devel
 BuildRequires:  pip
 BuildRequires:  python3-devel
 BuildRequires:  python3-build
diff --git a/moberg_tool.c b/moberg_tool.c
index 11a6b0c8d3d96de02c02f9335e3965a0d1055bed..846bfe41ed5d6a336611259061a6988620652728 100644
--- a/moberg_tool.c
+++ b/moberg_tool.c
@@ -11,11 +11,11 @@ int main(int argc, char *argv[])
 {
   
   if (argc == 2 && strcmp(argv[1], "--start") == 0) {
-    struct moberg *moberg = moberg_new(NULL);
+    struct moberg *moberg = moberg_new();
     moberg_start(moberg, stdout);
     moberg_free(moberg);    
   } else if (argc == 2 && strcmp(argv[1], "--stop") == 0) {
-    struct moberg *moberg = moberg_new(NULL);
+    struct moberg *moberg = moberg_new();
     moberg_stop(moberg, stdout);
     moberg_free(moberg);    
   } else if (argc == 2 && strcmp(argv[1], "-h") == 0) {
diff --git a/test/test_io.c b/test/test_io.c
index a730a2f48c6971b01864006f4ef3d5496658aaf4..82962257b0b5c2e5da4c38888b4a4190ee6f2443 100644
--- a/test/test_io.c
+++ b/test/test_io.c
@@ -3,7 +3,7 @@
 
 int main(int argc, char *argv[])
 {
-  struct moberg *moberg = moberg_new(NULL);
+  struct moberg *moberg = moberg_new();
   if (! moberg) {
     fprintf(stderr, "NEW failed\n");
     goto out;
diff --git a/test/test_start_stop.c b/test/test_start_stop.c
index ee0a49a51262b7af609519eb7be2527d0ab0427d..41065a2a09d6e0684bb420b35e6bd0ab4a72a752 100644
--- a/test/test_start_stop.c
+++ b/test/test_start_stop.c
@@ -4,7 +4,7 @@
 int main(int argc, char *argv[])
 {
   fprintf(stderr, "NEW\n");
-  struct moberg *moberg = moberg_new(NULL);
+  struct moberg *moberg = moberg_new();
   fprintf(stderr, "START:\n");
   moberg_start(moberg, stdout);
   fprintf(stderr, "STOP:\n");