Fix up build scripts for mr2