Add file output fixes