diff --git a/renderdocui/Interop/CustomMarshaling.cs b/renderdocui/Interop/CustomMarshaling.cs
index 1e711e6d6..1c2168d8c 100644
--- a/renderdocui/Interop/CustomMarshaling.cs
+++ b/renderdocui/Interop/CustomMarshaling.cs
@@ -161,7 +161,7 @@ namespace renderdoc
             // Get instance fields of the structure type. 
             FieldInfo[] fieldInfo = NonArrayType(field.FieldType).GetFields(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
 
-            int align = 0;
+            int align = 1;
 
             foreach (FieldInfo f in fieldInfo)
                 align = Math.Max(align, AlignOf(f));
@@ -290,7 +290,7 @@ namespace renderdoc
 
                 long size = 0;
 
-                int a = 0;
+                int a = 1;
 
                 foreach (FieldInfo field in fieldInfo)
                 {
diff --git a/renderdocui/Windows/StatisticsViewer.cs b/renderdocui/Windows/StatisticsViewer.cs
index 7870b0b1a..4d7ec8d47 100644
--- a/renderdocui/Windows/StatisticsViewer.cs
+++ b/renderdocui/Windows/StatisticsViewer.cs
@@ -58,7 +58,7 @@ namespace renderdocui.Windows
 
         private int SliceForString(string s, UInt32 value, UInt32 maximum)
         {
-            if (value == 0)
+            if (value == 0 || maximum == 0)
                 return 0;
 
             float ratio = (float)value / maximum;