Last minute changes to prepare for third-party runs of code