Fix bugs in File- and GraphHandler