Fix to rewrites + versioning