diff --git a/src/tools.f90 b/src/tools.f90
index 68c83f5f..d438c824 100644
--- a/src/tools.f90
+++ b/src/tools.f90
@@ -1023,7 +1023,7 @@ subroutine rename(oldname, newname, opt_rank)
     end if
 
     if (nrank == exe_rank) then
-       oldname_ext = gen_iodir_name(oldname, io_restart)
+       oldname_ext = trim(gen_iodir_name(oldname, io_restart))
        inquire(file=oldname_ext, exist=exist)
        if (exist) then
           cmd = "mv "//oldname_ext//" "//newname
@@ -1124,7 +1124,7 @@ logical function validate_restart(refname, testname, opt_rank)
     if (nrank == exe_rank) then
        success = .true.
 
-       testname_ext = gen_iodir_name(testname, io_restart)
+       testname_ext = trim(gen_iodir_name(testname, io_restart))
        
        inquire(file=refname, size=refsize, exist=refexist)
        inquire(file=testname_ext, size=testsize, exist=testexist)
diff --git a/src/visu.f90 b/src/visu.f90
index 529393c3..1d865253 100644
--- a/src/visu.f90
+++ b/src/visu.f90
@@ -147,7 +147,7 @@ subroutine visu_ready ()
     if (.not.outloc_init) then
        if (irestart == 1) then
           !! Restarting - is the output already available to write to?
-          inquire(file=gen_iodir_name("data", io_name), exist=dir_exists)
+          inquire(file=trim(gen_iodir_name("data", io_name)), exist=dir_exists)
           if (dir_exists) then
              outloc_init = .true.
           end if
@@ -167,7 +167,7 @@ subroutine visu_ready ()
 
     ! Write the vtk.xml file
     if (nrank.eq.0) then
-       open(newunit=ioxml, file="./data.bp4/vtk.xml")
+       open(newunit=ioxml, file=trim(gen_iodir_name("data", io_name))//"/vtk.xml")
 
        ! Header for a uniform grid
        write (ioxml, *) '<?xml version="1.0"?>'