More rewrites fixes + versioning