diff --git a/CUETools.Codecs.BDLPCM/MPLSReader.cs b/CUETools.Codecs.BDLPCM/MPLSReader.cs
index efa5d5c..0e88327 100644
--- a/CUETools.Codecs.BDLPCM/MPLSReader.cs
+++ b/CUETools.Codecs.BDLPCM/MPLSReader.cs
@@ -445,7 +445,7 @@ namespace CUETools.Codecs.BDLPCM
             {
                 switch (rate)
                 {
-                    case 1: return 23;
+                    case 1: return 24;
                     case 2: return 24;
                     case 3: return 25;
                     case 4: return 30;
@@ -492,8 +492,10 @@ namespace CUETools.Codecs.BDLPCM
                     case 3: return "reserved3";
                     case 4: return "96KHz";
                     case 5: return "192KHz";
-                    case 12: return "48/192KHz";
-                    case 14: return "48/96KHz";
+                    //case 12: return "48/192KHz"; (core/hd)
+                    case 12: return "192KHz";
+                    //case 14: return "48/96KHz"; (core/hd)
+                    case 14: return "96KHz";
                     default: return rate.ToString();
                 }
             }
@@ -516,7 +518,8 @@ namespace CUETools.Codecs.BDLPCM
                     case 0x83: return "TrueHD";
                     case 0x84: return "AC-3 Plus";
                     case 0x85: return "DTS-HD";
-                    case 0x86: return "DTS-HD Master";
+                    //case 0x86: return "DTS-HD Master";
+                    case 0x86: return "DTS Master Audio";
                     case 0xea: return "VC-1";
                     case 0x1b: return "h264/AVC";
                     case 0x90: return "Presentation Graphics";
diff --git a/CUETools.eac3to/App.config b/CUETools.eac3to/App.config
new file mode 100644
index 0000000..c8d467d
--- /dev/null
+++ b/CUETools.eac3to/App.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <probing privatePath="plugins"/>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/CUETools.eac3to/CUETools.eac3to.csproj b/CUETools.eac3to/CUETools.eac3to.csproj
index 9f259c6..4f6d254 100644
--- a/CUETools.eac3to/CUETools.eac3to.csproj
+++ b/CUETools.eac3to/CUETools.eac3to.csproj
@@ -68,6 +68,7 @@
     <ProjectReference Include="..\CUETools.Codecs.BDLPCM\CUETools.Codecs.BDLPCM.csproj">
       <Project>{E75F7CCD-4266-42E1-A039-DC7EB5EDD8F6}</Project>
       <Name>CUETools.Codecs.BDLPCM</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\CUETools.Codecs\CUETools.Codecs.csproj">
       <Project>{6458A13A-30EF-45A9-9D58-E5031B17BEE2}</Project>
@@ -103,6 +104,9 @@
       <Install>true</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/CUETools.eac3to/Program.cs b/CUETools.eac3to/Program.cs
index 3c3c99c..30c0ba7 100644
--- a/CUETools.eac3to/Program.cs
+++ b/CUETools.eac3to/Program.cs
@@ -128,6 +128,7 @@ namespace CUETools.eac3to
                     Console.ForegroundColor = ConsoleColor.White;
                     int maxVideo = 0, maxAudio = 0, frameRate = 0;
                     bool interlaced = false;
+                    var chapters = audioSource.MPLSHeader.Chapters;
                     audioSource.MPLSHeader.play_item.ForEach(i => maxVideo = Math.Max(maxVideo, i.video.Count));
                     audioSource.MPLSHeader.play_item.ForEach(i => maxAudio = Math.Max(maxAudio, i.audio.Count));
                     audioSource.MPLSHeader.play_item.ForEach(i => i.video.ForEach(v => frameRate = v.FrameRate));
@@ -145,7 +146,7 @@ namespace CUETools.eac3to
                             Console.Error.Write(id++);
                             Console.Error.Write(": ");
                             Console.ForegroundColor = ConsoleColor.Gray;
-                            Console.Error.WriteLine("Chapters, {0} chapters", audioSource.MPLSHeader.mark_count - 1);
+                            Console.Error.WriteLine("Chapters, {0} chapters", chapters.Count - 1);
                         }
                         if (audioSource.MPLSHeader.play_item.Count > 0)
                         {
@@ -175,7 +176,6 @@ namespace CUETools.eac3to
                     {
                         int id = 1;
                         ushort pid = 0;
-                        var chapters = audioSource.MPLSHeader.Chapters;
                         if (chapters.Count > 1)
                         {
                             if (stream == id)