diff --git a/src/com/android/browser/BrowserBookmarksPage.java b/src/com/android/browser/BrowserBookmarksPage.java
index 2df0561..dfb0b77 100644
--- a/src/com/android/browser/BrowserBookmarksPage.java
+++ b/src/com/android/browser/BrowserBookmarksPage.java
@@ -647,7 +647,7 @@
     private void copy(CharSequence text) {
         ClipboardManager cm = (ClipboardManager) getActivity().getSystemService(
                 Context.CLIPBOARD_SERVICE);
-        cm.setPrimaryClip(ClipData.newRawUri(null, null, Uri.parse(text.toString())));
+        cm.setPrimaryClip(ClipData.newRawUri(null, Uri.parse(text.toString())));
     }
 
     @Override
diff --git a/src/com/android/browser/BrowserPreferencesPage.java b/src/com/android/browser/BrowserPreferencesPage.java
index 2b42951..dae838f 100644
--- a/src/com/android/browser/BrowserPreferencesPage.java
+++ b/src/com/android/browser/BrowserPreferencesPage.java
@@ -70,7 +70,7 @@
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case android.R.id.home:
-                if (getFragmentManager().countBackStackEntries() > 0) {
+                if (getFragmentManager().getBackStackEntryCount() > 0) {
                     getFragmentManager().popBackStack();
                 } else {
                     finish();
diff --git a/src/com/android/browser/CombinedBookmarkHistoryView.java b/src/com/android/browser/CombinedBookmarkHistoryView.java
index f4b2e9c..5731c37 100644
--- a/src/com/android/browser/CombinedBookmarkHistoryView.java
+++ b/src/com/android/browser/CombinedBookmarkHistoryView.java
@@ -241,7 +241,7 @@
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         FragmentManager fm = mActivity.getFragmentManager();
-        FragmentTransaction transaction = fm.openTransaction();
+        FragmentTransaction transaction = fm.beginTransaction();
         if (mCurrentFragment == FRAGMENT_ID_BOOKMARKS) {
             transaction.remove(mBookmarks);
         } else if (mCurrentFragment == FRAGMENT_ID_HISTORY) {
diff --git a/src/com/android/browser/preferences/GeneralPreferencesFragment.java b/src/com/android/browser/preferences/GeneralPreferencesFragment.java
index 7545ba8..99a4ec9 100644
--- a/src/com/android/browser/preferences/GeneralPreferencesFragment.java
+++ b/src/com/android/browser/preferences/GeneralPreferencesFragment.java
@@ -195,7 +195,7 @@
             frag = new ImportWizardDialog();
         }
         frag.setArguments(preference.getExtras());
-        getFragmentManager().openTransaction()
+        getFragmentManager().beginTransaction()
                 .add(frag, null)
                 .commit();
         return true;
