[BUGFIX] Fix some path issues