diff --git a/android/src/main/java/com/horcrux/svg/GroupShadowNode.java b/android/src/main/java/com/horcrux/svg/GroupShadowNode.java
index 5eadcd22..b8956b74 100644
--- a/android/src/main/java/com/horcrux/svg/GroupShadowNode.java
+++ b/android/src/main/java/com/horcrux/svg/GroupShadowNode.java
@@ -10,10 +10,8 @@
 package com.horcrux.svg;
 
 import android.graphics.Canvas;
-import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Path;
-import android.graphics.Point;
 import android.graphics.RectF;
 
 import com.facebook.react.bridge.ReadableMap;
diff --git a/android/src/main/java/com/horcrux/svg/RenderableShadowNode.java b/android/src/main/java/com/horcrux/svg/RenderableShadowNode.java
index 594b9a80..18d9fa1b 100644
--- a/android/src/main/java/com/horcrux/svg/RenderableShadowNode.java
+++ b/android/src/main/java/com/horcrux/svg/RenderableShadowNode.java
@@ -9,19 +9,12 @@
 
 package com.horcrux.svg;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import android.graphics.Canvas;
 import android.graphics.DashPathEffect;
-import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Path;
-import android.graphics.Point;
 import android.graphics.RectF;
 import android.graphics.Region;
-import android.os.Build;
-import android.util.Log;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
@@ -34,7 +27,8 @@ import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static android.content.ContentValues.TAG;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * Renderable shadow node
diff --git a/android/src/main/java/com/horcrux/svg/SvgViewShadowNode.java b/android/src/main/java/com/horcrux/svg/SvgViewShadowNode.java
index 0495683c..a90e10e1 100644
--- a/android/src/main/java/com/horcrux/svg/SvgViewShadowNode.java
+++ b/android/src/main/java/com/horcrux/svg/SvgViewShadowNode.java
@@ -49,7 +49,6 @@ public class SvgViewShadowNode extends LayoutShadowNode {
     private String mbbHeight;
     private String mAlign;
     private int mMeetOrSlice;
-    private Matrix mViewBoxMatrix = new Matrix();
     private Matrix mInvViewBoxMatrix = new Matrix();
     private boolean mInvertible = true;
 
@@ -156,7 +155,7 @@ public class SvgViewShadowNode extends LayoutShadowNode {
             if (nested) {
                 canvas.clipRect(eRect);
             }
-            mViewBoxMatrix = ViewBox.getTransform(vbRect, eRect, mAlign, mMeetOrSlice);
+            Matrix mViewBoxMatrix = ViewBox.getTransform(vbRect, eRect, mAlign, mMeetOrSlice);
             mInvertible = mViewBoxMatrix.invert(mInvViewBoxMatrix);
             canvas.concat(mViewBoxMatrix);
         }
diff --git a/android/src/main/java/com/horcrux/svg/VirtualNode.java b/android/src/main/java/com/horcrux/svg/VirtualNode.java
index dd0c3952..768e17a7 100644
--- a/android/src/main/java/com/horcrux/svg/VirtualNode.java
+++ b/android/src/main/java/com/horcrux/svg/VirtualNode.java
@@ -13,7 +13,6 @@ import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Path;
-import android.graphics.Point;
 import android.graphics.RectF;
 import android.graphics.Region;
 
@@ -90,6 +89,8 @@ abstract class VirtualNode extends LayoutShadowNode {
     @Override
     public void markUpdated() {
         super.markUpdated();
+        canvasHeight = -1;
+        canvasWidth = -1;
         mRegion = null;
         mPath = null;
         mBox = null;