diff --git a/PBot/BanTracker.pm b/PBot/BanTracker.pm
index b08a938c..56005dd3 100644
--- a/PBot/BanTracker.pm
+++ b/PBot/BanTracker.pm
@@ -64,6 +64,8 @@ sub get_baninfo {
   my ($self, $mask, $channel, $account) = @_;
   my ($bans, $ban_account);
 
+  $account = lc $account if defined $account;
+
   foreach my $mode (keys %{ $self->{banlist}{$channel} }) {
     foreach my $banmask (keys %{ $self->{banlist}{$channel}{$mode} }) {
       my $banmask_key = $banmask;
diff --git a/PBot/ChanOpCommands.pm b/PBot/ChanOpCommands.pm
index 89e37be2..582f3524 100644
--- a/PBot/ChanOpCommands.pm
+++ b/PBot/ChanOpCommands.pm
@@ -65,6 +65,7 @@ sub ban_user {
   return "" if $target =~ /\Q$self->{pbot}->botnick\E/i;
 
   $self->{pbot}->chanops->ban_user_timed($target, $from, $length);    
+  return "/msg $nick $target banned in $from for $length seconds";
 }
 
 sub unban_user {
diff --git a/PBot/IRC/Connection.pm b/PBot/IRC/Connection.pm
index f1daf8f0..01f861a2 100644
--- a/PBot/IRC/Connection.pm
+++ b/PBot/IRC/Connection.pm
@@ -941,7 +941,7 @@ sub parse {
      $type = lc $type;
 
      # fix splitting of IPv6 hostnames in modes -- pragma- 2013/07/30
-     if($type eq "mode" and $#stuff > -1) {
+     if($type eq "mode" and $#stuff > -1 and length $line) {
        my @other_stuff = split /\s+/, $line;
        $stuff[$#stuff] .= ':' . shift @other_stuff;
        push @stuff, @other_stuff;
diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm
index 307c4223..c9de91f1 100644
--- a/PBot/VERSION.pm
+++ b/PBot/VERSION.pm
@@ -13,7 +13,7 @@ use warnings;
 # These are set automatically by the build/commit script
 use constant {
   BUILD_NAME     => "PBot",
-  BUILD_REVISION => 415,
+  BUILD_REVISION => 416,
   BUILD_DATE     => "2013-07-30",
 };