Fix archive helper methods