diff --git a/py/minimint/mist_interpolator.py b/py/minimint/mist_interpolator.py
index 301157c..1337508 100644
--- a/py/minimint/mist_interpolator.py
+++ b/py/minimint/mist_interpolator.py
@@ -61,7 +61,7 @@ def getheader(f):
 
 
 def read_grid(eep_prefix, outp_prefix):
-    fs = glob.glob('%s/*EEPS/*eep' % (eep_prefix, ))
+    fs = glob.glob(os.path.join([eep_prefix, '*EEPS', '*eep']))
     assert (len(fs) > 0)
     tmpfile = utils.tail_head(fs[0], 11, 10)
     tab0 = atpy.Table().read(tmpfile, format='ascii.fast_commented_header')
diff --git a/setup.py b/setup.py
index fcee637..ae0c1dd 100644
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@ def read(fname):
 VERSIONPIP = read('version.txt').rstrip()
 VERSION = VERSIONPIP + get_revision()
 
-with open('py/minimint/_version.py', 'w') as fp:
+with open(os.path.join(['py', 'minimint', '_version.py']), 'w') as fp:
     print('version="%s"' % (VERSION), file=fp)
 
 setup(
@@ -55,8 +55,8 @@ def read(fname):
     url="http://github.com/segasai/minimint",
     packages=['minimint'],
     scripts=[fname for fname in glob.glob(os.path.join('bin', '*'))],
-    package_dir={'': 'py/'},
-    package_data={'minimint': ['tests/']},
+    package_dir={'': 'py'},
+    package_data={'minimint': ['tests']},
     long_description=read('README.md'),
     long_description_content_type='text/markdown',
     classifiers=[