lib/PublicInbox/Daemon.pm    | 2 +-
 lib/PublicInbox/EvCleanup.pm | 4 +++-
 lib/PublicInbox/Inbox.pm     | 2 +-
 lib/PublicInbox/SearchMsg.pm | 2 +-

diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index 9d27d2be522e908d4cca5b3d2e9c859aecea59b1..4629aadb45ec070332ef20d93673409301409d3d 100644
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -460,7 +460,7 @@ 	# this calls epoll_create:
 	@listeners = map {
 		PublicInbox::Listener->new($_, $post_accept)
 	} @listeners;
-	$PublicInbox::EvCleanup::ENABLED = 1;
+	PublicInbox::EvCleanup::enable();
 	Danga::Socket->EventLoop;
 	$parent_pipe = undef;
 }
diff --git a/lib/PublicInbox/EvCleanup.pm b/lib/PublicInbox/EvCleanup.pm
index 384efd3d57d4c7a9746a554ad8fbeb79bcfed3bc..1a3a3d5e7735b6d8a3f2a12cd6ff4cc2ac7e3500 100644
--- a/lib/PublicInbox/EvCleanup.pm
+++ b/lib/PublicInbox/EvCleanup.pm
@@ -8,7 +8,9 @@ use warnings;
 use base qw(Danga::Socket);
 use fields qw(rd);
 
-our $ENABLED;
+my $ENABLED;
+sub enabled { $ENABLED }
+sub enable { $ENABLED = 1 }
 my $singleton;
 my $asapq = [ [], undef ];
 my $nextq = [ [], undef ];
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index f307038399b77437b8e5a94ed163e01559959466..666c81d7125cc68e7166e1249edcb2fec0376bdf 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -29,7 +29,7 @@ }
 
 sub _cleanup_later ($) {
 	my ($self) = @_;
-	return unless $PublicInbox::EvCleanup::ENABLED;
+	return unless PublicInbox::EvCleanup::enabled();
 	$cleanup_timer ||= PublicInbox::EvCleanup::later(*cleanup_task);
 	$CLEANUP->{"$self"} = $self;
 }
diff --git a/lib/PublicInbox/SearchMsg.pm b/lib/PublicInbox/SearchMsg.pm
index de1fd1313aaf28e035f4bb93d2ae9e7e8135a1a6..dd3d58d078a5a717ada9960835185f9925743afd 100644
--- a/lib/PublicInbox/SearchMsg.pm
+++ b/lib/PublicInbox/SearchMsg.pm
@@ -62,7 +62,7 @@ # :bytes and :lines metadata in RFC 3977
 sub bytes ($) { get_val($_[0]->{doc}, &PublicInbox::Search::BYTES) }
 sub lines ($) { get_val($_[0]->{doc}, &PublicInbox::Search::LINES) }
 sub num ($) {
-	$_[0]->{num} ||= get_val($_[0]->{doc}, PublicInbox::Search::NUM)
+	$_[0]->{num} ||= get_val($_[0]->{doc}, PublicInbox::Search::NUM())
 }
 
 sub __hdr ($$) {