diff --git a/src/server/graphql/models/Action/actionQuery.js b/src/server/graphql/models/Action/actionQuery.js
index 76475e846ec..9048e757f22 100644
--- a/src/server/graphql/models/Action/actionQuery.js
+++ b/src/server/graphql/models/Action/actionQuery.js
@@ -1,6 +1,5 @@
 import getRethink from 'server/database/rethinkDriver';
 import {GraphQLNonNull, GraphQLID, GraphQLInt} from 'graphql';
-import {Action} from './actionSchema';
 import {requireSUOrSelf} from 'server/utils/authorization';
 
 export default {
diff --git a/src/server/graphql/models/Organization/organizationQuery.js b/src/server/graphql/models/Organization/organizationQuery.js
index c1feb74192b..644a9c14304 100644
--- a/src/server/graphql/models/Organization/organizationQuery.js
+++ b/src/server/graphql/models/Organization/organizationQuery.js
@@ -21,7 +21,7 @@ export default {
       // RESOLUTION
       return await r.table('Organization')
         .getAll(userId, {index: 'orgUsers'})
-        .count()
+        .count();
     }
   },
   orgDetails: {
diff --git a/src/universal/modules/newTeam/containers/NewTeamForm/NewTeamFormContainer.js b/src/universal/modules/newTeam/containers/NewTeamForm/NewTeamFormContainer.js
index 1958dbfb5fd..abd36b64a6e 100644
--- a/src/universal/modules/newTeam/containers/NewTeamForm/NewTeamFormContainer.js
+++ b/src/universal/modules/newTeam/containers/NewTeamForm/NewTeamFormContainer.js
@@ -116,7 +116,7 @@ class NewTeamFormContainer extends Component {
   render() {
     const {initialOrgCount, initialValues, isNewOrg, organizations, router} = this.props;
     if (initialOrgCount === 0) {
-      router.push('/newteam/1')
+      router.push('/newteam/1');
     } else if (!initialValues.orgId) {
       return null;
     }
@@ -136,6 +136,8 @@ class NewTeamFormContainer extends Component {
 
 NewTeamFormContainer.propTypes = {
   dispatch: PropTypes.func.isRequired,
+  initialOrgCount: PropTypes.func.number,
+  initialValues: PropTypes.object,
   isNewOrg: PropTypes.bool,
   organizations: PropTypes.array,
   router: PropTypes.object.isRequired,
diff --git a/src/universal/modules/userDashboard/components/OrgBilling/OrgBilling.js b/src/universal/modules/userDashboard/components/OrgBilling/OrgBilling.js
index da3050ad276..81b96433fc2 100644
--- a/src/universal/modules/userDashboard/components/OrgBilling/OrgBilling.js
+++ b/src/universal/modules/userDashboard/components/OrgBilling/OrgBilling.js
@@ -72,6 +72,7 @@ const OrgBilling = (props) => {
 
 OrgBilling.propTypes = {
   invoices: PropTypes.array,
+  invoicesReady: PropTypes.bool,
   styles: PropTypes.object,
   org: PropTypes.object
 };
diff --git a/src/universal/modules/userDashboard/containers/CreditCardModal/CreditCardModalContainer.js b/src/universal/modules/userDashboard/containers/CreditCardModal/CreditCardModalContainer.js
index 9dc13b4fca8..064ab4a47a8 100644
--- a/src/universal/modules/userDashboard/containers/CreditCardModal/CreditCardModalContainer.js
+++ b/src/universal/modules/userDashboard/containers/CreditCardModal/CreditCardModalContainer.js
@@ -96,7 +96,7 @@ class CreditCardModalContainer extends Component {
 
   checkCardType = (e) => {
     const {stripeCard} = this.props;
-    if (e.currentTarget.value) {
+    if (stripeCard && e.currentTarget.value) {
       const type = stripeCard.cardType(e.currentTarget.value);
       const cardTypeIcon = cardTypeLookup[type];
       if (cardTypeIcon !== this.state.cardTypeIcon) {
diff --git a/src/universal/modules/userDashboard/containers/OrgBilling/OrgBillingContainer.js b/src/universal/modules/userDashboard/containers/OrgBilling/OrgBillingContainer.js
index 6c7f6140f91..c4f9a11294e 100644
--- a/src/universal/modules/userDashboard/containers/OrgBilling/OrgBillingContainer.js
+++ b/src/universal/modules/userDashboard/containers/OrgBilling/OrgBillingContainer.js
@@ -79,6 +79,7 @@ const OrgBillingContainer = (props) => {
 OrgBillingContainer.propTypes = {
   dispatch: PropTypes.func,
   invoiceList: PropTypes.array,
+  invoicesReady: PropTypes.bool,
   org: PropTypes.object
 };
 
diff --git a/src/universal/modules/userDashboard/containers/UserActionList/UserActionListContainer.js b/src/universal/modules/userDashboard/containers/UserActionList/UserActionListContainer.js
index 13c747593de..2518929ff92 100644
--- a/src/universal/modules/userDashboard/containers/UserActionList/UserActionListContainer.js
+++ b/src/universal/modules/userDashboard/containers/UserActionList/UserActionListContainer.js
@@ -96,6 +96,7 @@ const UserActionListContainer = (props) => {
 UserActionListContainer.propTypes = {
   actions: PropTypes.array,
   dispatch: PropTypes.func,
+  initialActionCount: PropTypes.number,
   queryKey: PropTypes.string,
   selectingNewActionTeam: PropTypes.bool,
   teams: PropTypes.array,