Fix File>New and File>Import bugs