Fixed up some dependency changes.