Cleanup
Attempt to mend paths