Fixed versions
Reapplied patches