fixup some path issues, this could use refactoring