Fixed relative path issues