Exchange <z:Z> with <v:V>
Some custom fixes