Fix build scripts yet again