Fixing audio issues (in progress)