Android & audio fixes