diff --git a/Frameworks/AudioToolbox/CAFDecoder.mm b/Frameworks/AudioToolbox/CAFDecoder.mm
index dc5ce65323..5452a82d80 100644
--- a/Frameworks/AudioToolbox/CAFDecoder.mm
+++ b/Frameworks/AudioToolbox/CAFDecoder.mm
@@ -200,7 +200,7 @@ uint64_t int64Swap(uint64_t val) {
 
     if (isPcm) {
         NSInteger result =
-            [stream read:(uint8_t*)&outOutputData maxLength:(cafDesc.mBytesPerPacket * (ioOutputDataByteSize / cafDesc.mBytesPerPacket))];
+            [stream read:(uint8_t*)outOutputData maxLength:(cafDesc.mBytesPerPacket * (ioOutputDataByteSize / cafDesc.mBytesPerPacket))];
         ioNumberPackets = (result / cafDesc.mBytesPerPacket);
         ioOutputDataByteSize = result;
         return;
diff --git a/Frameworks/QuartzCore/CALayer.mm b/Frameworks/QuartzCore/CALayer.mm
index d5cb20d1ce..f1800392fb 100644
--- a/Frameworks/QuartzCore/CALayer.mm
+++ b/Frameworks/QuartzCore/CALayer.mm
@@ -802,13 +802,11 @@ - (void)removeFromSuperlayer {
         return;
     }
 
-    CALayer* oursuper = priv->superlayer;
-
     //  If our layer is visible, order all subviews out
     bool isVisible = false;
 
     CALayer* curLayer = self;
-    CALayer* pSuper = (CALayer*)priv->superlayer;
+    CALayer* superLayer = (CALayer*)priv->superlayer;
     CALayer* nextSuper = curLayer->priv->superlayer;
     priv->superlayer = 0;
 
@@ -832,7 +830,9 @@ - (void)removeFromSuperlayer {
 
     [CATransaction _removeLayer:self];
 
-    pSuper->priv->removeChild(self);
+    superLayer->priv->removeChild(self);
+
+    [superLayer setNeedsLayout];
     [self release];
 }
 
diff --git a/build/winobjc.version b/build/winobjc.version
index eace59efda..0950e406d4 100644
--- a/build/winobjc.version
+++ b/build/winobjc.version
@@ -1,4 +1,4 @@
 # MAJOR.MINOR.BUILD.REVISION
 #   BUILD = YYMM
 #   REVISION = DD
-0.2.1612.21
+0.2.1612.30