Even more sound fixes