Use relative paths instead of absolute Closes #1630