Fix buildscript v2.0