Updates for deft, scratch, etc.