Fix 8 + versioning