Fixing hard-coded paths