Various updates that have accumulated, again
lingering updates