diff --git a/src/victory-shared-events/victory-shared-events.js b/src/victory-shared-events/victory-shared-events.js
index 1e40ebd..eade3a5 100644
--- a/src/victory-shared-events/victory-shared-events.js
+++ b/src/victory-shared-events/victory-shared-events.js
@@ -13,6 +13,7 @@ export default class VictorySharedEvents extends React.Component {
       React.PropTypes.node
     ]),
     container: React.PropTypes.node,
+    groupComponent: React.PropTypes.node,
     events: PropTypes.arrayOf(PropTypes.shape({
       childName: PropTypes.oneOfType([
         PropTypes.string,
@@ -35,6 +36,10 @@ export default class VictorySharedEvents extends React.Component {
     ])
   };
 
+  static defaultProps = {
+    groupComponent: <g/>
+  };
+
   constructor() {
     super();
     this.state = {};
@@ -124,16 +129,17 @@ export default class VictorySharedEvents extends React.Component {
         getEvents: partialRight(this.getScopedEvents, null, this.baseProps),
         getEventState: partialRight(this.getEventState, null)
       } : null;
+    const container = this.props.container || this.props.groupComponent;
     const boundGetEvents = Events.getEvents.bind(this);
     const parentEvents = boundGetEvents({sharedEvents}, "parent");
     const parentProps = defaults(
       {},
       this.getEventState("parent", "parent"),
-      props.container.props,
+      container.props,
       this.baseProps.parent
     );
     return React.cloneElement(
-      props.container,
+      container,
       assign(
         {}, parentProps, {events: Events.getPartialEvents(parentEvents, "parent", parentProps)}
       ),
@@ -143,7 +149,6 @@ export default class VictorySharedEvents extends React.Component {
 
   render() {
     const children = this.getNewChildren(this.props);
-    return this.props.container ? this.getContainer(this.props, children) : <g>{children}</g>;
-
+    return this.getContainer(this.props, children);
   }
 }
diff --git a/src/victory-theme/grayscale.js b/src/victory-theme/grayscale.js
index 0933d0b..590214e 100644
--- a/src/victory-theme/grayscale.js
+++ b/src/victory-theme/grayscale.js
@@ -75,7 +75,6 @@ export default {
       },
       ticks: {
         fill: "transparent",
-        padding: 10,
         size: 1,
         stroke: "transparent"
       },
diff --git a/src/victory-theme/material.js b/src/victory-theme/material.js
index 61acc91..d160b2b 100644
--- a/src/victory-theme/material.js
+++ b/src/victory-theme/material.js
@@ -86,7 +86,6 @@ export default {
       },
       ticks: {
         fill: "transparent",
-        padding,
         size: 5,
         stroke: blueGrey300,
         strokeWidth: 1,
diff --git a/src/victory-transition/victory-transition.js b/src/victory-transition/victory-transition.js
index 2ef0329..35c1d90 100644
--- a/src/victory-transition/victory-transition.js
+++ b/src/victory-transition/victory-transition.js
@@ -162,7 +162,7 @@ export default class VictoryTransition extends React.Component {
 
   render() {
     const props = this.state && this.state.nodesWillExit && !this.state.nodesDoneClipPathExit ?
-      this.state.oldProps : this.props;
+      this.state.oldProps || this.props : this.props;
     const getTransitionProps = this.props.animate && this.props.animate.getTransitions ?
       this.props.animate.getTransitions :
       Transitions.getTransitionPropsFactory(
diff --git a/src/victory-util/domain.js b/src/victory-util/domain.js
index dac217d..4855789 100644
--- a/src/victory-util/domain.js
+++ b/src/victory-util/domain.js
@@ -116,7 +116,7 @@ export default {
     // TODO: is this the correct behavior, or should we just error. How do we
     // handle charts with just one data point?
     if (min === max) {
-      const adjustedMax = max === 0 ? 1 : max + max;
+      const adjustedMax = max === 0 ? 1 : max;
       return [0, adjustedMax];
     }
     return [min, max];