diff --git a/Formula/evas-generic-loaders.rb b/Formula/evas-generic-loaders.rb
index bc517d5362..155dd958f2 100644
--- a/Formula/evas-generic-loaders.rb
+++ b/Formula/evas-generic-loaders.rb
@@ -1,5 +1,5 @@
 class EvasGenericLoaders < Formula
-  desc "Extra image loaders for complex image types for Enlightenment"
+  desc "Extra complex image type loaders for Enlightenment"
   homepage "https://enlightenment.org"
   url "https://download.enlightenment.org/rel/libs/evas_generic_loaders/evas_generic_loaders-1.14.0.tar.gz"
   sha256 "943b25427c4e77a3aeae72811557a0b1b7ec4c61aa53922a4c4faf17b3dea812"
diff --git a/Formula/exempi.rb b/Formula/exempi.rb
index dfac54ac6e..0624a260c9 100644
--- a/Formula/exempi.rb
+++ b/Formula/exempi.rb
@@ -1,6 +1,6 @@
 class Exempi < Formula
   desc "Library to parse XMP metadata"
-  homepage "http://libopenraw.freedesktop.org/wiki/Exempi"
+  homepage "https://wiki.freedesktop.org/libopenraw/Exempi/"
   url "http://libopenraw.freedesktop.org/download/exempi-2.2.2.tar.bz2"
   sha256 "0e7ad0e5e61b6828e38d31a8cc59c26c9adeed7edf4b26708c400beb6a686c07"
 
diff --git a/Formula/exim.rb b/Formula/exim.rb
index dc2dc47fd2..d2ffdea958 100644
--- a/Formula/exim.rb
+++ b/Formula/exim.rb
@@ -12,9 +12,8 @@ class Exim < Formula
     sha256 "28f88bffa0447b615552d5a80c31ff8a762afd801a803429cf015af00aafae8b" => :mountain_lion
   end
 
-  option "with-maildir", "Support delivery in Maildir format"
-
   deprecated_option "support-maildir" => "with-maildir"
+  option "with-maildir", "Support delivery in Maildir format"
 
   depends_on "pcre"
   depends_on "berkeley-db4"
@@ -56,7 +55,7 @@ class Exim < Formula
 
     ENV.j1 # See: https://lists.exim.org/lurker/thread/20111109.083524.87c96d9b.en.html
     system "make"
-    system "make INSTALL_ARG=-no_chown install"
+    system "make", "INSTALL_ARG=-no_chown", "install"
     man8.install "doc/exim.8"
     (bin/"exim_ctl").write startup_script
   end
diff --git a/Formula/exodriver.rb b/Formula/exodriver.rb
index 19eea590af..23ea04f497 100644
--- a/Formula/exodriver.rb
+++ b/Formula/exodriver.rb
@@ -6,10 +6,10 @@ class Exodriver < Formula
 
   head "https://github.com/labjack/exodriver.git"
 
-  depends_on "libusb"
-
   option :universal
 
+  depends_on "libusb"
+
   def install
     ENV.universal_binary if build.universal?