Fix for some path weirdness