Fix generation of mixed versions