diff --git a/MyTracks/res/layout/sensor_state.xml b/MyTracks/res/layout/sensor_state.xml
index acb085505..a6cd7f810 100644
--- a/MyTracks/res/layout/sensor_state.xml
+++ b/MyTracks/res/layout/sensor_state.xml
@@ -67,8 +67,6 @@ limitations under the License.
         <TableRow
           android:padding="1dip">
           <TextView
-            android:id="@+id/power_label"
-            android:textSize="20dip"
             android:layout_column="1"
             android:layout_span="3"
             android:text="@string/power" />
diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java b/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java
index c55f99523..667ed3c57 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java
@@ -199,7 +199,6 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
     int idxAccuracy = cursor.getColumnIndexOrThrow(TrackPointsColumns.ACCURACY);
     int idxSpeed = cursor.getColumnIndexOrThrow(TrackPointsColumns.SPEED);
     int idxSensor = cursor.getColumnIndexOrThrow(TrackPointsColumns.SENSOR);
-    int idxId = cursor.getColumnIndexOrThrow(TrackPointsColumns._ID);
 
     if (!cursor.isNull(idxLatitude)) {
       location.setLatitude(1. * cursor.getInt(idxLatitude) / 1E6);
@@ -475,8 +474,7 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
     contentResolver.delete(TracksColumns.CONTENT_URI, null, null);
     contentResolver.delete(TrackPointsColumns.CONTENT_URI,
         null, null);
-    contentResolver.delete(
-        WaypointsColumns.CONTENT_URI, null, null);
+    contentResolver.delete(WaypointsColumns.CONTENT_URI, null, null);
   }
 
   @Override
@@ -886,9 +884,8 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
   @Override
   public Uri insertTrackPoint(Location location, long trackId) {
     Log.d(MyTracksProvider.TAG, "MyTracksProviderUtilsImpl.insertTrackPoint");
-    Uri u = contentResolver.insert(TrackPointsColumns.CONTENT_URI,
+    return contentResolver.insert(TrackPointsColumns.CONTENT_URI,
         createContentValues(location, trackId));
-    return u;
   }
 
   @Override
diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/TrackPointsColumns.java b/MyTracks/src/com/google/android/apps/mytracks/content/TrackPointsColumns.java
index cbf6e5ed8..95e488116 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/content/TrackPointsColumns.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/content/TrackPointsColumns.java
@@ -33,7 +33,7 @@ public interface TrackPointsColumns extends BaseColumns {
       "vnd.android.cursor.dir/vnd.google.trackpoint";
   public static final String CONTENT_ITEMTYPE =
       "vnd.android.cursor.item/vnd.google.trackpoint";
-  public static final String DEFAULT_SORT_ORDER = "trackpoints._id";
+  public static final String DEFAULT_SORT_ORDER = "_id";
 
   /* All columns */
   public static final String TRACKID = "trackid";