Fix audio recording

Change-Id: Id9a9c3416e22651e07ca03cd4c2ee2e78c856501
Some tweaks

Change-Id: I8a979bf3c33a135d0a547750ec790aa530cf3aa0