Upgrade moc and fix integrity