Additional fix for relative paths