Some sound fixes