diff --git a/lib/RT/Action/SendEmail.pm b/lib/RT/Action/SendEmail.pm
index 76ee7175209..53756a9d229 100644
--- a/lib/RT/Action/SendEmail.pm
+++ b/lib/RT/Action/SendEmail.pm
@@ -693,7 +693,7 @@ sub SetRTSpecialHeaders {
 
 sub DeferDigestRecipients {
     my $self = shift;
-    $RT::Logger->debug( "Calling SetRecipientDigests for transaction " . $self->TransactionObj . ", id " . $self->TransactionObj->id );
+    $RT::Logger->debug( "Calling SetRecipientDigests for transaction id " . $self->TransactionObj->id );
 
     # The digest attribute will be an array of notifications that need to
     # be sent for this transaction.  The array will have the following
diff --git a/lib/RT/Attachment.pm b/lib/RT/Attachment.pm
index 3f7696d3705..4057b563358 100644
--- a/lib/RT/Attachment.pm
+++ b/lib/RT/Attachment.pm
@@ -190,7 +190,7 @@ sub Create {
                 Attachment    => $part,
             );
             unless ($id) {
-                $RT::Logger->crit("Attachment insert failed: ". $RT::Handle->dbh->errstr);
+                $RT::Logger->crit("Attachment subpart insert failed.");
                 return ($id);
             }
         }
diff --git a/lib/RT/Interface/Web/Handler.pm b/lib/RT/Interface/Web/Handler.pm
index 3ccb56e791f..93fab728ecb 100644
--- a/lib/RT/Interface/Web/Handler.pm
+++ b/lib/RT/Interface/Web/Handler.pm
@@ -174,7 +174,7 @@ sub CleanupRequest {
         $RT::Handle->ForceRollback;
         $RT::Logger->crit(
             "Transaction not committed. Usually indicates a software fault."
-            . "Data loss may have occurred" );
+            . " Data loss may have occurred." );
     }
 
     # Clean out the ACL cache. the performance impact should be marginal.
diff --git a/lib/RT/Test/Web.pm b/lib/RT/Test/Web.pm
index db7a708f7a8..cc266caae71 100644
--- a/lib/RT/Test/Web.pm
+++ b/lib/RT/Test/Web.pm
@@ -269,7 +269,7 @@ sub next_warning_like {
     if (@{ $self->{stashed_server_warnings} || [] } == 0) {
         my @warnings = $self->get_warnings;
         if (@warnings == 0) {
-            Test::More::fail("no warnings emitted; expected 1");
+            Test::More::fail("no warnings emitted; expected at least 1");
             return 0;
         }
         $self->{stashed_server_warnings} = \@warnings;
diff --git a/t/web/charting.t b/t/web/charting.t
index 586ddd0d448..284df70d46e 100644
--- a/t/web/charting.t
+++ b/t/web/charting.t
@@ -9,7 +9,7 @@ for my $n (1..7) {
     my $ticket = RT::Ticket->new( RT->SystemUser );
     my $req = 'root' . ($n % 2) . '@localhost';
     my ( $ret, $msg ) = $ticket->Create(
-        Subject   => "base ticket $_",
+        Subject   => "base ticket $n",
         Queue     => "General",
         Owner     => "root",
         Requestor => $req,
@@ -19,8 +19,8 @@ for my $n (1..7) {
         MIMEObj   => MIME::Entity->build(
             From    => $req,
             To      => 'rt@localhost',
-            Subject => "base ticket $_",
-            Data    => "Content $_",
+            Subject => "base ticket $n",
+            Data    => "Content $n",
         ),
     );
     ok( $ret, "ticket $n created: $msg" );