A batch of minor "reviving" changes