diff --git a/aws-blog-kinesis-storm-clickstream-app/pom.xml b/aws-blog-kinesis-storm-clickstream-app/pom.xml
index b408ee7b..830d1cd3 100644
--- a/aws-blog-kinesis-storm-clickstream-app/pom.xml
+++ b/aws-blog-kinesis-storm-clickstream-app/pom.xml
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>13.0-final</version>
+            <version>13.0</version>
         </dependency>
         <dependency>
             <groupId>redis.clients</groupId>
diff --git a/aws-blog-kinesis-storm-clickstream-app/static/cloudformation/kinesis-storm-clickstream-stack.template b/aws-blog-kinesis-storm-clickstream-app/static/cloudformation/kinesis-storm-clickstream-stack.template
index 7de0b2fd..d8fe4830 100644
--- a/aws-blog-kinesis-storm-clickstream-app/static/cloudformation/kinesis-storm-clickstream-stack.template
+++ b/aws-blog-kinesis-storm-clickstream-app/static/cloudformation/kinesis-storm-clickstream-stack.template
@@ -366,8 +366,8 @@
                                 "cd /mnt/clickstream-demo\n", 
                                 "npm install \"connect@2.20\" >> /home/ec2-user/node-install.log 2>&1 || error_exit 'Failed to install NodeJs.See node-install.log for details'\n", 
                                 "npm install redis >> /home/ec2-user/node-install.log 2>&1 || error_exit 'Failed to install NodeJs.See node-install.log for details'\n", 
-                                "wget http://fastly.github.io/epoch/download/epoch.0.6.0.zip >> /home/ec2-user/epoch-install.log 2>&1 || error_exit 'Failed to install Epoch.See epoch-install.log for details'\n", 
-                                "unzip epoch.0.6.0.zip >> /home/ec2-user/epoch-install.log 2>&1 || error_exit 'Failed to install Epoch.See epoch-install.log for details'\n", 
+                                "wget https://cdn.jsdelivr.net/epoch/0.8.4/epoch.zip >> /home/ec2-user/epoch-install.log 2>&1 || error_exit 'Failed to install Epoch.See epoch-install.log for details'\n", 
+                                "unzip epoch.zip >> /home/ec2-user/epoch-install.log 2>&1 || error_exit 'Failed to install Epoch.See epoch-install.log for details'\n", 
                                 "\n", 
                                 "## Starting Node app\n", 
                                 "redisNode=$(aws elasticache describe-cache-clusters --show-cache-node-info --query 'CacheClusters[].CacheNodes[].Endpoint.Address' --output text --region ",