Fix buildscript v3.0