diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a03df26..271c6b7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,6 +18,7 @@
         <activity
             android:name="protect.babymonitor.StartActivity"
             android:label="@string/app_name"
+            android:configChanges="orientation|screenSize"
             >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -27,16 +28,19 @@
         <activity
             android:name="protect.babymonitor.MonitorActivity"
             android:label="@string/app_name"
+            android:configChanges="orientation|screenSize"
             android:parentActivityName="protect.babymonitor.StartActivity"
             />
         <activity
             android:name="protect.babymonitor.DiscoverActivity"
             android:label="@string/app_name"
+            android:configChanges="orientation|screenSize"
             android:parentActivityName="protect.babymonitor.StartActivity"
             />
         <activity
             android:name="protect.babymonitor.ListenActivity"
             android:label="@string/app_name"
+            android:configChanges="orientation|screenSize"
             android:parentActivityName="protect.babymonitor.DiscoverActivity"
             />
     </application>
diff --git a/res/layout/activity_monitor.xml b/res/layout/activity_monitor.xml
index 566286e..07625b9 100644
--- a/res/layout/activity_monitor.xml
+++ b/res/layout/activity_monitor.xml
@@ -8,6 +8,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
+    android:keepScreenOn="true"
     tools:context="protect.babymonitor.MonitorActivity" >
 
     <TextView
diff --git a/src/protect/babymonitor/ListenActivity.java b/src/protect/babymonitor/ListenActivity.java
index f2e5b9e..0e1b66e 100644
--- a/src/protect/babymonitor/ListenActivity.java
+++ b/src/protect/babymonitor/ListenActivity.java
@@ -50,7 +50,7 @@ public class ListenActivity extends Activity
         int audioEncoding = AudioFormat.ENCODING_PCM_16BIT;
         int bufferSize = AudioTrack.getMinBufferSize(frequency, channelConfiguration, audioEncoding);
 
-        final AudioTrack audioTrack = new AudioTrack(AudioManager.STREAM_VOICE_CALL,
+        final AudioTrack audioTrack = new AudioTrack(AudioManager.STREAM_MUSIC,
                 frequency,
                 channelConfiguration,
                 audioEncoding,
@@ -63,6 +63,8 @@ public class ListenActivity extends Activity
         Thread playThread = new Thread(audioPlayer);
         playThread.start();
 
+        setVolumeControlStream(AudioManager.STREAM_MUSIC);
+
         InputStream is = socket.getInputStream();
         int read = 0;