Yet another fix for path stuff