diff --git a/.travis.yml b/.travis.yml
index dc9a0815..e816c83f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,14 +6,16 @@ branches:
   only:
   - leapyear-patchset
 env:
-  global:
-  - CASHER_TIME_OUT=3600
+- BUILD_MACHINE=ec2-user@52.52.174.72
+- BUILD_MACHINE=administrator@207.254.73.194  # MacOS 10.11 (El Capitan)
+- BUILD_MACHINE=administrator@207.254.60.203  # MacOS 10.12 (Sierra)
+global:
+- CASHER_TIME_OUT=3600
 before_install:
 - openssl aes-256-cbc -K $encrypted_02288c648d1c_key -iv $encrypted_02288c648d1c_iv -in leapyear-builder-us-west-1.pem.enc -out leapyear-builder-us-west-1.pem -d
 - chmod 0600 leapyear-builder-us-west-1.pem
+- echo "Building on $BUILD_MACHINE"
 script:
-- "./remote_build.sh leapyear-builder-us-west-1.pem administrator@207.254.60.203" # MacOS 10.12 (Sierra)
-- "./remote_build.sh leapyear-builder-us-west-1.pem ec2-user@52.52.174.72"
-- "./remote_build.sh leapyear-builder-us-west-1.pem administrator@207.254.73.194" # MacOS 10.11 (El Capitan)
+- ./remote_build.sh leapyear-builder-us-west-1.pem $BUILD_MACHINE
 notifications:
   slack: leapyear:o4w7lKexDuDCzmPSayJuQg9m
diff --git a/jni/stack.yaml b/jni/stack.yaml
index ffc057b2..d6b1778d 100644
--- a/jni/stack.yaml
+++ b/jni/stack.yaml
@@ -8,6 +8,7 @@ packages:
 
 extra-deps:
 - thread-local-storage-0.1.0.4
+- choice-0.2.0
 
 nix:
   enable: true
diff --git a/jvm/default.nix b/jvm/default.nix
index e4107793..fd85a5d6 100644
--- a/jvm/default.nix
+++ b/jvm/default.nix
@@ -1,6 +1,6 @@
 let
   pkgs = import ./nixpkgs.nix;
-  
+
   hsPkgs =
     pkgs.haskell // {
       packages = pkgs.haskell.packages // {
diff --git a/jvm/stack.yaml b/jvm/stack.yaml
index 2f847ae6..4bf2109b 100644
--- a/jvm/stack.yaml
+++ b/jvm/stack.yaml
@@ -9,6 +9,7 @@ packages:
 
 extra-deps:
 - thread-local-storage-0.1.0.4
+- choice-0.2.0
 
 nix:
   enable: true
diff --git a/remote_build.sh b/remote_build.sh
index 255e023a..52d8c14b 100755
--- a/remote_build.sh
+++ b/remote_build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-set -x 
+set -x
 
 KEYFILE="$1"
 USER_AT_IP="$2"