Fixed old core dependency issues.