TN3109: Resolving common archiving issues