Improved support for relative paths