diff --git a/examples/basics/pages/en/users.js b/examples/basics/pages/en/users.js
index 378409cc74..76f3ae7374 100644
--- a/examples/basics/pages/en/users.js
+++ b/examples/basics/pages/en/users.js
@@ -14,9 +14,9 @@ const siteConfig = require(process.cwd() + "/siteConfig.js");
 
 class Users extends React.Component {
   render() {
-    const showcase = siteConfig.users.map(user => {
+    const showcase = siteConfig.users.map((user, i) => {
       return (
-        <a href={user.infoLink}>
+        <a href={user.infoLink} key={i}>
           <img src={user.image} title={user.caption} />
         </a>
       );
@@ -30,14 +30,11 @@ class Users extends React.Component {
               <h1>Who's Using This?</h1>
               <p>This project is used by many folks</p>
             </div>
-            <div className="logos">
-              {showcase}
-            </div>
+            <div className="logos">{showcase}</div>
             <p>Are you using this project?</p>
             <a
               href="https://github.com/deltice/test-site/edit/master/website/siteConfig.js"
-              className="button"
-            >
+              className="button">
               Add your company
             </a>
           </div>
diff --git a/lib/core/BlogPageLayout.js b/lib/core/BlogPageLayout.js
index bc3d261eaa..62d53ecbb1 100644
--- a/lib/core/BlogPageLayout.js
+++ b/lib/core/BlogPageLayout.js
@@ -13,7 +13,7 @@ const React = require("react");
 const Site = require("./Site.js");
 
 // used to generate entire blog pages, i.e. collection of truncated blog posts
-const BlogPageLayout = React.createClass({
+class BlogPageLayout extends React.Component {
   getPageURL(page) {
     let url = this.props.config.baseUrl + "blog/";
     if (page > 0) {
@@ -66,6 +66,6 @@ const BlogPageLayout = React.createClass({
       </Site>
     );
   }
-});
+}
 
 module.exports = BlogPageLayout;
diff --git a/lib/core/Header.js b/lib/core/Header.js
index 6ff584b930..f880112a26 100644
--- a/lib/core/Header.js
+++ b/lib/core/Header.js
@@ -8,7 +8,7 @@
 const React = require("react");
 const toSlug = require("./toSlug.js");
 
-const Header = React.createClass({
+class Header extends React.Component {
   render() {
     const slug = toSlug(this.props.toSlug || this.props.children);
     const Heading = "h" + this.props.level;
@@ -23,6 +23,6 @@ const Header = React.createClass({
       </Heading>
     );
   }
-});
+}
 
 module.exports = Header;
diff --git a/lib/core/Redirect.js b/lib/core/Redirect.js
index 4b268351b9..a8128c90e1 100644
--- a/lib/core/Redirect.js
+++ b/lib/core/Redirect.js
@@ -54,7 +54,7 @@ class Redirect extends React.Component {
                 `
             }}
           />
-        </body>{" "}
+        </body>
       </html>
     );
   }
diff --git a/lib/server/generate.js b/lib/server/generate.js
index 257c1c3f68..b919651f26 100644
--- a/lib/server/generate.js
+++ b/lib/server/generate.js
@@ -380,7 +380,7 @@ function execute() {
 
       fs.writeFileSync(mainCss, cssContent);
     } else if (!fs.lstatSync(file).isDirectory()) {
-      let parts = file.split("static");
+      let parts = file.split("/static/");
       let targetFile =
         CWD + "/build/" + siteConfig.projectName + "/" + parts[1];
       mkdirp.sync(targetFile.replace(new RegExp("/[^/]*$"), ""));
@@ -451,7 +451,6 @@ function execute() {
         );
         writeFileAndCreateFolder(targetFile, str);
       }
-
       fs.removeSync(tempFile);
     } else if (!fs.lstatSync(file).isDirectory()) {
       // copy other non .js files
diff --git a/website/blog/2017-09-25-testing-rss.md b/website/blog/2017-09-25-testing-rss.md
index ac5146d0e9..b7ff8129ce 100644
--- a/website/blog/2017-09-25-testing-rss.md
+++ b/website/blog/2017-09-25-testing-rss.md
@@ -1,5 +1,5 @@
 ---
-title: Adding RSS Support
+title: Adding RSS Support - RSS Truncation Test
 author: Eric Nakagawa
 authorURL: http://twitter.com/ericnakagawa
 authorFBID: 661277173
diff --git a/website/package.json b/website/package.json
index 14550faa95..1a4be8973f 100644
--- a/website/package.json
+++ b/website/package.json
@@ -7,13 +7,11 @@
 		"write-translations": "../lib/write-translations.js",
 		"version": "../lib/version.js",
 		"rename-version": "../lib/rename-version.js",
-		"crowdin-upload":
-			"crowdin-cli --config ../crowdin.yaml upload sources --auto-update -b master",
-		"crowdin-download":
-			"crowdin-cli --config ../crowdin.yaml download -b master"
+		"crowdin-upload": "crowdin-cli --config ../crowdin.yaml upload sources --auto-update -b master",
+		"crowdin-download": "crowdin-cli --config ../crowdin.yaml download -b master"
 	},
 	"dependencies": {
 		"async": "^2.5.0",
-		"docusaurus": "^1.0.0-alpha.42"
+		"docusaurus": "../../Docusaurus/"
 	}
 }
diff --git a/website/pages/en/users.js b/website/pages/en/users.js
index 9e276b55ad..d3d1a291b5 100644
--- a/website/pages/en/users.js
+++ b/website/pages/en/users.js
@@ -14,9 +14,9 @@ const siteConfig = require(process.cwd() + "/siteConfig.js");
 
 class Users extends React.Component {
   render() {
-    const showcase = siteConfig.users.map(user => {
+    const showcase = siteConfig.users.map((user, i) => {
       return (
-        <a href={user.infoLink}>
+        <a href={user.infoLink} key={i}>
           <img src={user.image} title={user.caption} />
         </a>
       );
@@ -30,14 +30,11 @@ class Users extends React.Component {
               <h1>Who's Using This?</h1>
               <p>This project is used by many folks</p>
             </div>
-            <div className="logos">
-              {showcase}
-            </div>
+            <div className="logos">{showcase}</div>
             <p>Are you using this project?</p>
             <a
               href="https://github.com/facebookexperimental/docusaurus/edit/master/website/siteConfig.js"
-              className="button"
-            >
+              className="button">
               Add your project
             </a>
           </div>