diff --git a/SSToolkit/SSTextView.m b/SSToolkit/SSTextView.m
index 1303edb..5b93e1a 100644
--- a/SSToolkit/SSTextView.m
+++ b/SSToolkit/SSTextView.m
@@ -95,7 +95,11 @@ - (void)drawRect:(CGRect)rect {
 
 		// Draw the text
 		[_placeholderTextColor set];
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_6_0
+		[_placeholder drawInRect:rect withFont:self.font lineBreakMode:NSLineBreakByTruncatingTail alignment:self.textAlignment];
+#else
 		[_placeholder drawInRect:rect withFont:self.font lineBreakMode:UILineBreakModeTailTruncation alignment:self.textAlignment];
+#endif
 	}
 }
 
diff --git a/SSToolkit/SSWebViewController.m b/SSToolkit/SSWebViewController.m
index 67ddead..e5b3cbd 100644
--- a/SSToolkit/SSWebViewController.m
+++ b/SSToolkit/SSWebViewController.m
@@ -144,7 +144,16 @@ - (NSURL *)currentURL {
 #pragma mark - Actions
 
 - (void)close:(id)sender {
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_5_0
+	if ([self.navigationController respondsToSelector:@selector(dismissViewControllerAnimated:completion:)])
+	{
+		[self.navigationController dismissViewControllerAnimated:YES completion:nil];
+		return;
+	}
+#endif
+#if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_6_0
 	[self.navigationController dismissModalViewControllerAnimated:YES];
+#endif
 }
 
 
@@ -181,7 +190,17 @@ - (void)emailURL:(id)sender {
 	viewController.subject = self.title;
 	viewController.mailComposeDelegate = self;
 	[viewController setMessageBody:_webView.lastRequest.mainDocumentURL.absoluteString isHTML:NO];
+	
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_5_0
+	if ([self.navigationController respondsToSelector:@selector(presentViewController:animated:completion:)])
+	{
+		[self.navigationController presentViewController:viewController animated:YES completion:nil];
+		return;
+	}
+#endif
+#if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_6_0
 	[self.navigationController presentModalViewController:viewController animated:YES];
+#endif
 }
 
 
@@ -255,7 +274,16 @@ - (void)actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSIn
 #pragma mark - MFMailComposeViewControllerDelegate
 
 - (void)mailComposeController:(MFMailComposeViewController *)controller didFinishWithResult:(MFMailComposeResult)result error:(NSError *)error {
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_5_0
+	if ([controller respondsToSelector:@selector(dismissViewControllerAnimated:completion:)])
+	{
+		[controller dismissViewControllerAnimated:YES completion:nil];
+		return;
+	}
+#endif
+#if __IPHONE_OS_VERSION_MAX_ALLOWED < __IPHONE_6_0
 	[controller dismissModalViewControllerAnimated:YES];
+#endif
 }
 
 @end