Really fixed path issues
Revert "Presumably fixed one crash"

This reverts commit 1249ba8be547ba5f95f3ba24433b1a261c1342c1.