diff --git a/src/components/FormIconField.js b/src/components/FormIconField.js
index 46809c5..15bc9b3 100644
--- a/src/components/FormIconField.js
+++ b/src/components/FormIconField.js
@@ -5,8 +5,9 @@ const classNames = require('classnames');
 const FormField = require('./FormField');
 const Spinner = require('./Spinner');
 
-const ICON_MAP = require('../Octicons').map;
-const ICON_KEYS = require('../Octicons').keys;
+const Octicons = require('../Octicons').Octicon;
+const ICON_MAP = Octicons.map;
+const ICON_KEYS = Octicons.keys;
 const COLOR_VARIANTS = ['danger', 'default', 'primary', 'success', 'warning'];
 
 export default React.createClass({
diff --git a/src/components/FormInput.js b/src/components/FormInput.js
index 125713a..51d4989 100644
--- a/src/components/FormInput.js
+++ b/src/components/FormInput.js
@@ -42,7 +42,7 @@ export default React.createClass({
 		this.input.select();
 	},
 	getRef (ref) {
-		this.target = ref;
+		this.input = ref;
 
 		if (this.props.innerRef) {
 			this.props.innerRef(ref);
diff --git a/src/components/Glyph.js b/src/components/Glyph.js
index 42cfbce..bca8bec 100644
--- a/src/components/Glyph.js
+++ b/src/components/Glyph.js
@@ -1,8 +1,9 @@
 var React = require('react');
 var classNames = require('classnames');
 
-var icons = require('../Octicons').map;
-var validNames = require('../Octicons').keys;
+const Octicons = require('../Octicons').Octicon;
+const icons = Octicons.map;
+const validNames = Octicons.keys;
 
 var Glyph = React.createClass({
 	displayName: 'Glyph',