diff --git a/.travis.yml b/.travis.yml
index 6abe4d23..edab949d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ install:
 
 script:
   - npm test
-  - npm run build
+  - travis_wait 60 npm run build
 
 after_success:
   - pip install --user awscli
diff --git a/gatsby-config.js b/gatsby-config.js
index 9a1937f4..790ed403 100644
--- a/gatsby-config.js
+++ b/gatsby-config.js
@@ -159,10 +159,11 @@ module.exports = {
           {
             site {
               siteMetadata {
+                siteTitle
+                siteDescription
                 siteUrl
-                author {
-                  name
-                }
+                title: siteTitle
+                description: siteDescription
                 site_url: siteUrl
               }
             }
@@ -170,15 +171,15 @@ module.exports = {
         `,
         feeds: [
           {
-            serialize: ({ query: { site, allMarkdownRemark } }) => {
+            serialize: ({ query: { allMarkdownRemark } }) => {
               return allMarkdownRemark.edges.map(edge => ({
                 title: edge.node.frontmatter.title,
                 date: edge.node.fields.date,
                 description: feedContent(edge),
-                url: site.siteMetadata.siteUrl + edge.node.fields.slug,
+                url: siteConfig.siteUrl + edge.node.fields.slug,
                 categories: edge.node.frontmatter.tags,
-                author: site.siteMetadata.author.name,
-                guid: site.siteMetadata.siteUrl + edge.node.fields.slug
+                author: siteConfig.author.name,
+                guid: siteConfig.siteUrl + edge.node.fields.slug
               }))
             },
             query: `