Fixed file path issues