Update REPO; Fix Pkgfile consistency.