CORE-5259: Made build script updates
These were necessary as part of the last commit