Fix path resolutions