diff --git a/src/org/mythtv/client/ui/AbstractLocationAwareFragmentActivity.java b/src/org/mythtv/client/ui/AbstractLocationAwareFragmentActivity.java
index db81d0d4..ef3ce225 100644
--- a/src/org/mythtv/client/ui/AbstractLocationAwareFragmentActivity.java
+++ b/src/org/mythtv/client/ui/AbstractLocationAwareFragmentActivity.java
@@ -124,7 +124,7 @@ protected void onStop() {
 		if( null != channelDownloadReceiver ) {
 			try {
 				unregisterReceiver( channelDownloadReceiver );
-				channelDownloadReceiver = null;
+				//channelDownloadReceiver = null;
 			} catch( IllegalArgumentException e ) {
 				Log.e( TAG, "onStop : error", e );
 			}
@@ -133,7 +133,7 @@ protected void onStop() {
 		if( null != programGuideCleanupReceiver ) {
 			try {
 				unregisterReceiver( programGuideCleanupReceiver );
-				programGuideCleanupReceiver = null;
+				//programGuideCleanupReceiver = null;
 			} catch( IllegalArgumentException e ) {
 				Log.e( TAG, "onStop : error", e );
 			}
@@ -142,7 +142,7 @@ protected void onStop() {
 		if( null != programGuideDownloadReceiver ) {
 			try {
 				unregisterReceiver( programGuideDownloadReceiver );
-				programGuideDownloadReceiver = null;
+				//programGuideDownloadReceiver = null;
 			} catch( IllegalArgumentException e ) {
 				Log.e( TAG, "onStop : error", e );
 			}
diff --git a/src/org/mythtv/client/ui/dvr/AbstractDvrActivity.java b/src/org/mythtv/client/ui/dvr/AbstractDvrActivity.java
index 32122402..0d6d0248 100644
--- a/src/org/mythtv/client/ui/dvr/AbstractDvrActivity.java
+++ b/src/org/mythtv/client/ui/dvr/AbstractDvrActivity.java
@@ -64,16 +64,18 @@ public boolean onOptionsItemSelected( MenuItem item ) {
 		switch( item.getItemId() ) {
 			case android.R.id.home:
 			
+				finish();
+				
 				// app icon in action bar clicked; go home
-				if( getMainApplication().getConnectedLocationProfile().equals( "HOME" ) ) {
-					Intent intent = new Intent( this, HomeActivity.class );
-					intent.addFlags( Intent.FLAG_ACTIVITY_CLEAR_TOP );
-					startActivity( intent );
-				} else {
-					Intent intent = new Intent( this, AwayActivity.class );
-					intent.addFlags( Intent.FLAG_ACTIVITY_CLEAR_TOP );
-					startActivity( intent );
-				}
+//				if( getMainApplication().getConnectedLocationProfile().equals( "HOME" ) ) {
+//					Intent intent = new Intent( this, HomeActivity.class );
+//					intent.addFlags( Intent.FLAG_ACTIVITY_CLEAR_TOP );
+//					startActivity( intent );
+//				} else {
+//					Intent intent = new Intent( this, AwayActivity.class );
+//					intent.addFlags( Intent.FLAG_ACTIVITY_CLEAR_TOP );
+//					startActivity( intent );
+//				}
 
 			return true;
 		}