Various fixes to merge
Various fixes to merge

juped/archaeology-cutoff,juped/archaeology-cutoff,juped/archaeology-cutoff,juped/archaeology-cutoff,juped/archaeology-cutoff,juped/archaeology-cutoff,juped/archaeology-cutoff,juped/archaeology-cutoff,juped/archaeology-cutoff,juped/archaeology-cutoff