Mostly some missing dependencies that turned up during our upgrade.