Update build scripts for TMO AND SPR