diff --git a/pom.xml b/pom.xml
index 38d885a..39f1bb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     </scm>
 
     <properties>
-        <clojure.version>1.2.0</clojure.version>
+        <clojure.version>1.3.0</clojure.version>
     </properties>
 
     <dependencies>
@@ -38,12 +38,6 @@
             <artifactId>aws-java-sdk</artifactId>
             <version>1.1.5</version>
         </dependency>
-        <dependency>
-            <groupId>org.clojure</groupId>
-            <artifactId>clojure-contrib</artifactId>
-            <version>1.2.0</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/clojure/cemerick/bandalore.clj b/src/main/clojure/cemerick/bandalore.clj
index 0b525a5..b5443d4 100644
--- a/src/main/clojure/cemerick/bandalore.clj
+++ b/src/main/clojure/cemerick/bandalore.clj
@@ -113,9 +113,9 @@
                                         :or {limit 1
                                              attributes #{}}}]
   (let [req (-> (ReceiveMessageRequest. queue-url)
-              (.withMaxNumberOfMessages (-> limit (min 10) (max 1)))
+              (.withMaxNumberOfMessages (-> limit (min 10) (max 1) Integer.))
               (.withAttributeNames attributes))
-        req (if visibility (.withVisibilityTimeout req visibility) req)]
+        req (if visibility (.withVisibilityTimeout req (Integer. visibility)) req)]
     (->> (.receiveMessage client req)
       .getMessages
       (map (partial message-map queue-url)))))
diff --git a/src/test/clojure/cemerick/bandalore_test.clj b/src/test/clojure/cemerick/bandalore_test.clj
index b7fd029..2d36309 100644
--- a/src/test/clojure/cemerick/bandalore_test.clj
+++ b/src/test/clojure/cemerick/bandalore_test.clj
@@ -13,7 +13,7 @@
     (assert (and id secret-key))
     (create-client id secret-key)))
 
-(def *test-queue-url* nil)
+(def ^{:dynamic true} *test-queue-url* nil)
 
 (defn- uuid
   []