Added _pkgbuild to required vars
Multiple fixes