Corrupt file fix and minor message changes