Fixed dependency issues after upgrade.