patch: buildscript with build error fixes