Fix some issues with relative paths