Small fixes PCM