Updates, mostly to deprecate stuff