diff --git a/Bolts.podspec b/Bolts.podspec
index 7404bf860..f106badc6 100644
--- a/Bolts.podspec
+++ b/Bolts.podspec
@@ -20,17 +20,8 @@ Pod::Spec.new do |s|
   s.tvos.deployment_target = '9.0'
 
   s.subspec 'Tasks' do |ss|
-    ss.ios.source_files = 'Bolts/Common/*.[hm]'
-    ss.ios.public_header_files = 'Bolts/Common/*.h'
-
-    ss.osx.source_files = 'Bolts/Common/*.[hm]'
-    ss.osx.public_header_files = 'Bolts/Common/*.h'
-
-    ss.watchos.source_files = 'Bolts/Common/*.[hm]'
-    ss.watchos.public_header_files = 'Bolts/Common/*.h'
-
-    ss.tvos.source_files = 'Bolts/Common/*.[hm]'
-    ss.tvos.public_header_files = 'Bolts/Common/*.h'
+    ss.source_files = 'Bolts/Common/*.[hm]'
+    ss.public_header_files = 'Bolts/Common/*.h'
   end
 
   s.subspec 'AppLinks' do |ss|
@@ -39,8 +30,5 @@ Pod::Spec.new do |s|
 
     ss.ios.source_files = 'Bolts/iOS/**/*.[hm]'
     ss.ios.public_header_files = 'Bolts/iOS/*.h'
-    ss.osx.source_files = ''
-    ss.watchos.source_files = ''
-    ss.tvos.source_files = ''
   end
 end
diff --git a/Bolts/iOS/BFAppLinkReturnToRefererController.m b/Bolts/iOS/BFAppLinkReturnToRefererController.m
index 7c90f097d..5decae865 100644
--- a/Bolts/iOS/BFAppLinkReturnToRefererController.m
+++ b/Bolts/iOS/BFAppLinkReturnToRefererController.m
@@ -130,7 +130,7 @@ - (void)statusBarFrameWillChange:(NSNotification *)notification {
         if (CGRectGetHeight(newFrame) == 40) {
             UIViewAnimationOptions options = UIViewAnimationOptionBeginFromCurrentState;
             [UIView animateWithDuration:kBFViewAnimationDuration delay:0.0 options:options animations:^{
-                self->_view.frame = CGRectMake(0.0, 0.0, CGRectGetWidth(_view.bounds), 0.0);
+                self->_view.frame = CGRectMake(0.0, 0.0, CGRectGetWidth(self->_view.bounds), 0.0);
             } completion:nil];
         }
     }
@@ -141,7 +141,7 @@ - (void)statusBarFrameDidChange:(NSNotification *)notification {
     CGRect newFrame;
     [rectValue getValue:&newFrame];
 
-    if (_navigationController && !_view.closed) {
+    if (self->_navigationController && !self->_view.closed) {
         if (CGRectGetHeight(newFrame) == 40) {
             UIViewAnimationOptions options = UIViewAnimationOptionBeginFromCurrentState;
             [UIView animateWithDuration:kBFViewAnimationDuration delay:0.0 options:options animations:^{
@@ -206,7 +206,7 @@ - (void)closeViewAnimated:(BOOL)animated explicitlyClosed:(BOOL)explicitlyClosed
     } else {
         closer();
         if (explicitlyClosed) {
-            _view.closed = YES;
+            self->_view.closed = YES;
         }
     }
 }
diff --git a/scripts/build_framework.sh b/scripts/build_framework.sh
index b7534aa27..fcf0271c8 100755
--- a/scripts/build_framework.sh
+++ b/scripts/build_framework.sh
@@ -87,8 +87,8 @@ progress_message Building Framework.
 # -----------------------------------------------------------------------------
 # Compile binaries 
 #
-test -d "$BOLTS_BUILD" \
-  || mkdir -p "$BOLTS_BUILD" \
+rm -rf "$BOLTS_BUILD"
+mkdir -p "$BOLTS_BUILD" \
   || die "Could not create directory $BOLTS_BUILD"
 
 test -d "$BOLTS_IOS_BUILD" \
@@ -120,7 +120,7 @@ function xcode_build_target() {
     -configuration "${2}" \
     SYMROOT="$BOLTS_BUILD" \
     CURRENT_PROJECT_VERSION="$BOLTS_VERSION_FULL" \
-    clean build \
+    build \
     || die "Xcode build failed for platform: ${1}."
 }