[z2161] Fix DynVmaps and build after the recent commits

(based on commit [s1793] - 6e170b1)