Path fixes

Attempt #2