Fixed path issues in main