diff --git a/TwitterKit/TwitterKit.podspec b/TwitterKit.podspec
similarity index 87%
rename from TwitterKit/TwitterKit.podspec
rename to TwitterKit.podspec
index de725cba..1eb3ee48 100644
--- a/TwitterKit/TwitterKit.podspec
+++ b/TwitterKit.podspec
@@ -7,8 +7,8 @@ Pod::Spec.new do |s|
   s.social_media_url = "https://twitter.com/TwitterDev"
   s.authors = "Twitter"
   s.platform = :ios, "9.0"
-  s.source = { :http => "https://ton.twimg.com/syndication/twitterkit/ios/#{s.version}/TwitterKit.zip" }
-  s.vendored_frameworks = "iOS/TwitterKit.framework"
+  s.source = { :git => 'git@github.com:buzzfeed/twitter-kit-ios.git', :tag => 'buzzfeed-3.3.0' }
+  s.source_files = 'TwitterKit/TwitterKit/*.{h,m}'
   s.license = { :type => "Commercial", :text => "Twitter Kit: Copyright Twitter, Inc. All Rights Reserved. Use of this software is subject to the terms and conditions of the Twitter Kit Agreement located at https://dev.twitter.com/overview/terms/twitterkit and the Developer Agreement located at https://dev.twitter.com/overview/terms/agreement. OSS: https://github.com/twitter/twitter-kit-ios/blob/master/OS_LICENSES.md"}
   s.resources = ["iOS/TwitterKit.framework/TwitterKitResources.bundle", "iOS/TwitterKit.framework/TwitterShareExtensionUIResources.bundle"]
   s.frameworks = "CoreText", "QuartzCore", "CoreData", "CoreGraphics", "Foundation", "Security", "UIKit", "CoreMedia", "AVFoundation", "SafariServices"
diff --git a/TwitterKit/TwitterKit/Social/Syndication/Views/TWTRTweetMediaView.m b/TwitterKit/TwitterKit/Social/Syndication/Views/TWTRTweetMediaView.m
index ef9d98fe..6a627946 100644
--- a/TwitterKit/TwitterKit/Social/Syndication/Views/TWTRTweetMediaView.m
+++ b/TwitterKit/TwitterKit/Social/Syndication/Views/TWTRTweetMediaView.m
@@ -420,6 +420,10 @@ - (void)presentVideo:(TWTRVideoPlaybackConfiguration *)videoConfig fromViewContr
 
 - (void)presentMediaViewController:(UIViewController<TWTRMediaContainerPresentable> *)mediaViewController fromView:(UIView *)view presentingViewController:(UIViewController *)presentingViewController
 {
+    if (mediaViewController == nil) {
+        return;
+    }
+
     TWTRMediaContainerViewController *mediaContainer = [[TWTRMediaContainerViewController alloc] initWithMediaViewController:mediaViewController];
 
     // Delay this for a short moment to avoid flickering when showing the view.
diff --git a/TwitterKit/TwitterShareExtensionUI/TwitterShareExtensionUI/Private/Composer/TWTRSETweetTextViewContainer.m b/TwitterKit/TwitterShareExtensionUI/TwitterShareExtensionUI/Private/Composer/TWTRSETweetTextViewContainer.m
index a5ef4747..5e813048 100644
--- a/TwitterKit/TwitterShareExtensionUI/TwitterShareExtensionUI/Private/Composer/TWTRSETweetTextViewContainer.m
+++ b/TwitterKit/TwitterShareExtensionUI/TwitterShareExtensionUI/Private/Composer/TWTRSETweetTextViewContainer.m
@@ -183,6 +183,13 @@ - (void)_tseui_updateCharacterCount
     self.characterCounterLabel.textColor = ([self.tweet isNearOrOverCharacterLimit]) ? _characterCountOverLimitColor : _characterCountBelowLimitColor;
 }
 
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+
+    [self _tseui_updateLineCount];
+}
+
 - (void)_tseui_updateLineCount
 {
     NSUInteger textViewNumberOfLines = _textView.numberOfLines;