Fix variable product problems