Fix a couple of deprecated things.