Couple of changes into archive contents