Trying to fix path issues. Partially successful