diff --git a/configure.ac b/configure.ac
index d4357893..fc4f8e77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -605,7 +605,7 @@ AM_CONDITIONAL(USE_DBUS, test "x$dbus" = "xyes")
 AM_CONDITIONAL(HAVE_ISO_CODES, test "x$isocodes" = "xyes")
 AM_CONDITIONAL(HAVE_GTK_MAC, test "x$_gdk_tgt" = xquartz)
 AM_CONDITIONAL(WITH_TM, test "x$theme_manager" != "xno")
-AM_CONDITIONAL(PLATFORM_OSX, test "x$platform_osx" == "xyes")
+AM_CONDITIONAL(PLATFORM_OSX, test "x$platform_osx" = "xyes")
 
 dnl *********************************************************************
 dnl ** CFLAGS ***********************************************************
diff --git a/plugins/perl/lib/HexChat.pm b/plugins/perl/lib/HexChat.pm
index 11623ac0..fe9a8fe6 100644
--- a/plugins/perl/lib/HexChat.pm
+++ b/plugins/perl/lib/HexChat.pm
@@ -102,7 +102,7 @@ sub register {
 	unless( $name && $name =~ /[[:print:]\w]/ ) {
 		$name = "Not supplied";
 	}
-	unless( $version && $version =~ /\d+(?:\.\d+)?/ ) {
+	unless( defined $version && $version =~ /\d+(?:\.\d+)?/ ) {
 		$version = "NaN";
 	}
 	$pkg_info->{gui_entry} =
diff --git a/src/common/url.c b/src/common/url.c
index b9e0f675..a741fb04 100644
--- a/src/common/url.c
+++ b/src/common/url.c
@@ -601,7 +601,7 @@ re_url (void)
 }
 
 /*	EMAIL description --- */
-#define EMAIL "[a-z][._%+-a-z0-9]+@" "(" HOST_URL ")"
+#define EMAIL "[a-z0-9][._%+-a-z0-9]+@" "(" HOST_URL ")"
 
 static const GRegex *
 re_email (void)