Fix scripts for new architectures