diff --git a/C4/Biblio.pm b/C4/Biblio.pm
index 173704b29e..0271cdc2d5 100644
--- a/C4/Biblio.pm
+++ b/C4/Biblio.pm
@@ -556,6 +556,7 @@ sub LinkBibHeadingsToAuthorities {
     }
     require C4::Heading;
     require C4::AuthoritiesMarc;
+
     $allowrelink = 1 unless defined $allowrelink;
     my $num_headings_changed = 0;
     foreach my $field ( $bib->fields() ) {
diff --git a/svc/cataloguing/automatic_linker.pl b/svc/cataloguing/automatic_linker.pl
index 711debf92d..62f25073bb 100755
--- a/svc/cataloguing/automatic_linker.pl
+++ b/svc/cataloguing/automatic_linker.pl
@@ -4,18 +4,18 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 3 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
 use CGI;
diff --git a/t/Biblio.t b/t/Biblio.t
index a847edaa97..fe1c4c90e4 100755
--- a/t/Biblio.t
+++ b/t/Biblio.t
@@ -157,4 +157,3 @@ warnings_like { $ret = UpdateTotalIssues() }
     "UpdateTotalIssues returns carped warnings if biblio record does not exist";
 
 ok( !defined $ret, 'UpdateTotalIssues returns carped warning if biblio record does not exist');
-1;
diff --git a/t/db_dependent/Biblio.t b/t/db_dependent/Biblio.t
index 4286565018..21c39ae91c 100755
--- a/t/db_dependent/Biblio.t
+++ b/t/db_dependent/Biblio.t
@@ -767,13 +767,13 @@ subtest "LinkBibHeadingsToAuthorities record generation tests" => sub {
     );
 
     #Add test for this case using verbose
-    my ( $num_headings_changed, $results ) = LinkBibHeadingsToAuthorities($linker, $record, "",undef, 1);
+    ( $num_headings_changed, $results ) = LinkBibHeadingsToAuthorities($linker, $record, "",undef, 1);
     my $details = $results->{details};
     is( $num_headings_changed, 1, 'We changed the one we passed' );
     is( $results->{details}->[0]->{status}, 'CREATED', "We added an authority record for the heading using verbose");
 
     # Now we check the authority record itself
-    my $authority = GetAuthority($results->{details}->[0]->{authid});
+    $authority = GetAuthority($results->{details}->[0]->{authid});
 
     is( $authority->field('150')->as_string(),
          "Beach city Weirdness Fiction Books 21st Century Fish Stew Pizza",
@@ -800,13 +800,13 @@ subtest "LinkBibHeadingsToAuthorities record generation tests" => sub {
         "The generated record contains the correct subfields"
     );
 
-    # The same exemple With verbose
+    # The same example With verbose
     ( $num_headings_changed, $results ) = LinkBibHeadingsToAuthorities($linker, $record, "",undef, 1);
     is( $num_headings_changed, 1, 'We changed the one we passed' );
     is( $results->{details}->[0]->{status}, 'CREATED', "We added an authority record for the heading using verbose");
 
     # Now we check the authority record itself
-    my $authority = GetAuthority($results->{details}->[0]->{authid});
+    $authority = GetAuthority($results->{details}->[0]->{authid});
     is( $authority->field('100')->as_string(),
          "Tolkien, J. R. R. (John Ronald Reuel), 1892-1973. Lord of the rings",
          "The generated record contains the correct subfields"