diff --git a/modules/cjeopardy/cjeopardy.pl b/modules/cjeopardy/cjeopardy.pl
index 657ff5af..7c18d06f 100755
--- a/modules/cjeopardy/cjeopardy.pl
+++ b/modules/cjeopardy/cjeopardy.pl
@@ -11,6 +11,8 @@ use Time::HiRes qw/gettimeofday/;
 use Time::Duration qw/duration/;
 use Fcntl qw(:flock);
 
+use lib ".";
+
 use IRCColors;
 use QStatskeeper;
 
diff --git a/modules/cjeopardy/cjeopardy_answer.pl b/modules/cjeopardy/cjeopardy_answer.pl
index b916b654..c43a83f2 100755
--- a/modules/cjeopardy/cjeopardy_answer.pl
+++ b/modules/cjeopardy/cjeopardy_answer.pl
@@ -12,6 +12,8 @@ use Time::HiRes qw(gettimeofday);
 use Time::Duration qw(duration concise);
 use Fcntl qw(:flock);
 
+use lib ".";
+
 use QStatskeeper;
 use Scorekeeper;
 use IRCColors;
diff --git a/modules/cjeopardy/cjeopardy_filter.pl b/modules/cjeopardy/cjeopardy_filter.pl
index 8323457e..5a47b02d 100755
--- a/modules/cjeopardy/cjeopardy_filter.pl
+++ b/modules/cjeopardy/cjeopardy_filter.pl
@@ -25,7 +25,7 @@ if ($channel !~ /^#/) {
 if (not length $filter) {
   my $ret = open my $fh, '<', "$CJEOPARDY_FILTER-$channel";
   if (not defined $ret) {
-    print "There is no filter active for $channel. Usage: filter <comma or space separated list of words> or `filter clear` to clear.\n";
+    print "There is no filter active for $channel. Usage: filter <comma separated list of words> or `filter clear` to clear.\n";
     exit;
   }
 
@@ -34,7 +34,7 @@ if (not length $filter) {
   chomp $words;
   $words =~ s/,/, /g;
   $words =~ s/, ([^,]+)$/ or $1/;
-  print "Filter active. Questions containing $words will be skipped. Usage: filter <comma or space separated list of words> or `filter clear` to clear.\n";
+  print "Filter active. Questions containing $words will be skipped. Usage: filter <comma separated list of words> or `filter clear` to clear.\n";
   exit;
 }
 
@@ -50,7 +50,7 @@ if ($filter eq 'clear') {
 }
 
 $filter =~ s/(^\s+|\s+$)//g;
-my @words = split /[ ,]+/, $filter;
+my @words = split /\s*,\s*/, $filter;
 
 if (not @words) {
   print "What?\n";
diff --git a/modules/cjeopardy/cjeopardy_hint.pl b/modules/cjeopardy/cjeopardy_hint.pl
index 4b7f4b4f..9557945d 100755
--- a/modules/cjeopardy/cjeopardy_hint.pl
+++ b/modules/cjeopardy/cjeopardy_hint.pl
@@ -11,6 +11,8 @@ use Time::HiRes qw/gettimeofday/;
 use Time::Duration qw/duration/;
 use Fcntl qw(:flock);
 
+use lib ".";
+
 use Scorekeeper;
 use QStatskeeper;
 use IRCColors;
diff --git a/modules/cjeopardy/cjeopardy_qstats.pl b/modules/cjeopardy/cjeopardy_qstats.pl
index 717da231..ff88706d 100755
--- a/modules/cjeopardy/cjeopardy_qstats.pl
+++ b/modules/cjeopardy/cjeopardy_qstats.pl
@@ -11,6 +11,8 @@ use Time::HiRes qw(gettimeofday);
 use Time::Duration qw(duration concise);
 use POSIX 'strftime';
 
+use lib ".";
+
 use QStatskeeper;
 
 my $command   = shift @ARGV;
diff --git a/modules/cjeopardy/cjeopardy_scores.pl b/modules/cjeopardy/cjeopardy_scores.pl
index bc149272..f559ac58 100755
--- a/modules/cjeopardy/cjeopardy_scores.pl
+++ b/modules/cjeopardy/cjeopardy_scores.pl
@@ -10,6 +10,8 @@ use strict;
 use Time::HiRes qw(gettimeofday);
 use Time::Duration qw(concise duration);
 
+use lib ".";
+
 use Scorekeeper;
 use IRCColors;
 
diff --git a/modules/cjeopardy/cjeopardy_show.pl b/modules/cjeopardy/cjeopardy_show.pl
index df344768..e796af03 100755
--- a/modules/cjeopardy/cjeopardy_show.pl
+++ b/modules/cjeopardy/cjeopardy_show.pl
@@ -7,6 +7,8 @@
 use warnings;
 use strict;
 
+use lib ".";
+
 use IRCColors;
 use QStatskeeper;