Fix pkgver to AUR helpers

And other small changes