Bug fixes: relative path resolutions