diff --git a/client/components/form/input-checkbox-multiple.jsx b/client/components/form/input-checkbox-multiple.jsx
index 4d624ee..a48157a 100644
--- a/client/components/form/input-checkbox-multiple.jsx
+++ b/client/components/form/input-checkbox-multiple.jsx
@@ -1,5 +1,6 @@
 /** External Dependencies **/
 var React = require( 'react' ),
+	ReactDom = require( 'react-dom' ),
 	classNames = require( 'classnames' ),
 	forEach = require( 'lodash/forEach' ),
 	isArray = require( 'lodash/isArray' ),
@@ -70,9 +71,9 @@ module.exports = React.createClass( {
 	},
 
 	unHighlightAllSites: function( event ) {
-		var checked = $( React.findDOMNode( this.refs.allItems ) ).prop( 'checked' );
+		var checked = $( ReactDom.findDOMNode( this.refs.allItems ) ).prop( 'checked' );
 		if ( checked && ! event.target.checked ) {
-			$( React.findDOMNode( this.refs.allItems ) ).prop( 'checked', false );
+			$( ReactDom.findDOMNode( this.refs.allItems ) ).prop( 'checked', false );
 		}
 	},
 
diff --git a/client/components/form/input-text.js b/client/components/form/input-text.js
index f0c5ebb..c3f483a 100644
--- a/client/components/form/input-text.js
+++ b/client/components/form/input-text.js
@@ -1,5 +1,6 @@
 /** External Dependencies **/
 var React = require( 'react' ),
+	ReactDom = require( 'react-dom' ),
 	Formsy = require( 'formsy-react' ),
 	classNames = require( 'classnames' ),
 	Payment = require( 'payment' );
@@ -20,6 +21,7 @@ module.exports = React.createClass( {
 		description: React.PropTypes.string,
 		className: React.PropTypes.any,
 		style: React.PropTypes.any,
+		style: React.PropTypes.any,
 		floatingLabel: React.PropTypes.any,
 		label: React.PropTypes.any,
 		type: React.PropTypes.string,
@@ -60,7 +62,7 @@ module.exports = React.createClass( {
 	},
 
 	focus: function() {
-		React.findDOMNode( this.refs.input ).focus();
+		ReactDom.findDOMNode( this.refs.input ).focus();
 	},
 
 	getDefaultProps: function() {
diff --git a/client/components/modal/index.jsx b/client/components/modal/index.jsx
index 6fe3d63..85bd4a6 100644
--- a/client/components/modal/index.jsx
+++ b/client/components/modal/index.jsx
@@ -1,4 +1,5 @@
 var React = require( 'react' ),
+	ReactDom = require( 'react-dom' ),
 	Icon = require( '../icon' ),
 	classNames = require( 'classnames' ),
 	assign = require( 'lodash/assign' );
@@ -49,7 +50,7 @@ let Modal = React.createClass( {
 		jQuery( 'body' ).addClass( 'dops-modal-showing' );
 		jQuery( document ).keyup( this.handleEscapeKey );
 		try {
-			focusTrap.activate(this.getDOMNode(), {
+			focusTrap.activate( ReactDom.findDOMNode( this ), {
 				// onDeactivate: this.maybeClose,
 				initialFocus: this.props.initialFocus,
 			});
diff --git a/client/components/my-sites-navigation/picker/index.jsx b/client/components/my-sites-navigation/picker/index.jsx
index 046bbf4..ef5049b 100644
--- a/client/components/my-sites-navigation/picker/index.jsx
+++ b/client/components/my-sites-navigation/picker/index.jsx
@@ -2,6 +2,7 @@
  * External dependencies
  */
 var React = require( 'react' ),
+	ReactDom = require( 'react-dom' ),
 	noop = require( 'lodash/noop' );
 
 /**
@@ -36,7 +37,7 @@ module.exports = React.createClass( {
 	},
 
 	closePickerOnOutsideClick: function( event ) {
-		var pickerNode = React.findDOMNode( this.refs.siteSelector );
+		var pickerNode = ReactDom.findDOMNode( this.refs.siteSelector );
 
 		// If the picker is open & the user clicks outside of it, let's close it
 		if ( this.props.showingSites &&
diff --git a/client/components/my-sites-navigation/site-selector/index.jsx b/client/components/my-sites-navigation/site-selector/index.jsx
index 1e46984..1e36d53 100644
--- a/client/components/my-sites-navigation/site-selector/index.jsx
+++ b/client/components/my-sites-navigation/site-selector/index.jsx
@@ -2,6 +2,7 @@
  * External dependencies
  */
 var React = require( 'react' ),
+	ReactDom = require( 'react-dom' ),
 	page = require( 'page' ),
 	noop = require( 'lodash/noop' ),
 	classNames = require( 'classnames' );
@@ -48,7 +49,7 @@ module.exports = React.createClass( {
 	},
 
 	doSearch: function() {
-		this.setState( { search: React.findDOMNode( this.refs.searchInput ).value } );
+		this.setState( { search: ReactDom.findDOMNode( this.refs.searchInput ).value } );
 	},
 
 	onSiteSelect: function( event ) {
diff --git a/client/components/notice/style.scss b/client/components/notice/style.scss
index aa0af6e..aaf091e 100644
--- a/client/components/notice/style.scss
+++ b/client/components/notice/style.scss
@@ -15,6 +15,10 @@
 	line-height: 1.4285;
 	animation: appear .3s ease-in-out;
 
+	&::before{
+		@extend %dashicon;
+	}
+
 	.dops-notice__text {
 		flex-grow: 1;
 		flex-basis: 100px;
@@ -31,7 +35,6 @@
 		font-size: inherit;
 
 		&::before {
-			@extend %dashicon;
 			content: '\f534';
 			position: absolute;
 				top: 23px;
diff --git a/client/lib/credit-card-details/validation.js b/client/lib/credit-card-details/validation.js
index 653e5b2..09e666b 100644
--- a/client/lib/credit-card-details/validation.js
+++ b/client/lib/credit-card-details/validation.js
@@ -6,7 +6,7 @@ var creditcards = require( 'creditcards' ),
 	isArray = require( 'lodash/isArray' ),
 	isEmpty = require( 'lodash/isEmpty' ),
 	toArray = require( 'lodash/toArray' ),
-	inRange = require( 'lodash/number/inRange' ),
+	inRange = require( 'lodash/inRange' ),
 	capitalize = require( 'lodash/capitalize' );
 
 /**
diff --git a/client/lib/wpcom-undocumented/lib/undocumented.js b/client/lib/wpcom-undocumented/lib/undocumented.js
index ca017a9..69c811f 100644
--- a/client/lib/wpcom-undocumented/lib/undocumented.js
+++ b/client/lib/wpcom-undocumented/lib/undocumented.js
@@ -4,7 +4,7 @@
 var debug = require( 'debug' )( 'calypso:wpcom-undocumented:undocumented' ),
 	isPlainObject = require( 'lodash/isPlainObject' ),
 	clone = require( 'lodash/clone' ),
-	omit = require( 'lodash/object/omit' ),
+	omit = require( 'lodash/omit' ),
 	camelCase = require( 'lodash/camelCase' ),
 	snakeCase = require( 'lodash/snakeCase' );
 
diff --git a/client/scss/calypso-form.scss b/client/scss/calypso-form.scss
index 2454e96..1a79d8c 100644
--- a/client/scss/calypso-form.scss
+++ b/client/scss/calypso-form.scss
@@ -1,5 +1,6 @@
 // Below, you can choose from either using global form styles or class-driven
 // form styles. By default, the global styles are on.
+@import 'extends';
 
 %form {
 	ul {