Changes to facilitate preprod creation