Fix File issues