generator fixes for Vitera sample file