Fixed bugs related to file locn