diff --git a/srcpkgs/perl-Class-Accessor/template b/srcpkgs/perl-Class-Accessor/template
index d9678467c78..23c9a982e0a 100644
--- a/srcpkgs/perl-Class-Accessor/template
+++ b/srcpkgs/perl-Class-Accessor/template
@@ -1,10 +1,12 @@
 # Template file for 'perl-Class-Accessor'
 pkgname=perl-Class-Accessor
 version=0.51
-revision=1
+revision=2
+noarch=yes
 wrksrc="${pkgname//perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
+checkdepends="perl-Sub-Name"
 depends="perl"
 short_desc="Automated accessor generation"
 maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
diff --git a/srcpkgs/perl-IO-CaptureOutput/template b/srcpkgs/perl-IO-CaptureOutput/template
index b6aadb28914..f40200ea8a8 100644
--- a/srcpkgs/perl-IO-CaptureOutput/template
+++ b/srcpkgs/perl-IO-CaptureOutput/template
@@ -1,7 +1,9 @@
 # Template file for 'perl-IO-CaptureOutput'
 pkgname=perl-IO-CaptureOutput
 version=1.1104
-revision=1
+revision=2
+noarch=yes
+wrksrc="IO-CaptureOutput-${version}"
 build_style=perl-module
 hostmakedepends="perl"
 makedepends="${hostmakedepends}"
@@ -9,7 +11,6 @@ depends="perl"
 short_desc="Capture STOUT/ERR from perl code"
 maintainer="Sir_Boops <admin@boops.me>"
 homepage="http://search.cpan.org/dist/IO-CaptureOutput/"
-license="Artistic, GPL-1"
+license="Artistic-1.0-Perl, GPL-1.0-or-later"
 distfiles="${CPAN_SITE}/IO/IO-CaptureOutput-$version.tar.gz"
 checksum=fcc732fcb438f97a72b30e8c7796484bef2562e374553b207028e2fbf73f8330
-wrksrc="IO-CaptureOutput-${version}"
diff --git a/srcpkgs/perl-Stream-Buffered/template b/srcpkgs/perl-Stream-Buffered/template
index a1c20ab6fe1..510d7e190ef 100644
--- a/srcpkgs/perl-Stream-Buffered/template
+++ b/srcpkgs/perl-Stream-Buffered/template
@@ -1,7 +1,8 @@
 # Template build file for 'perl-Stream-Buffered'
 pkgname=perl-Stream-Buffered
 version=0.03
-revision=1
+revision=2
+noarch=yes
 wrksrc="Stream-Buffered-$version"
 build_style=perl-module
 hostmakedepends="perl"
diff --git a/srcpkgs/perl-WebService-MusicBrainz/template b/srcpkgs/perl-WebService-MusicBrainz/template
index 4551b651764..317aa63f80d 100644
--- a/srcpkgs/perl-WebService-MusicBrainz/template
+++ b/srcpkgs/perl-WebService-MusicBrainz/template
@@ -1,10 +1,12 @@
 # Template file for 'perl-WebService-MusicBrainz'
 pkgname=perl-WebService-MusicBrainz
 version=1.0.4
-revision=1
+revision=2
+noarch=yes
 wrksrc="${pkgname//perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"
+checkdepends="perl-Mojolicious"
 depends="perl perl-Class-Accessor perl-URI perl-XML-LibXML perl-LWP perl-Mojolicious"
 short_desc="Web service API to MusicBrainz database, pre-1.0 version"
 maintainer="Urs Schulz <voidpkgs@ursschulz.de>"