more fixes for assemblies with no variants