Some bugs in processing finished files