diff --git a/CUETools.Codecs.APE/CUETools.Codecs.APE.cpp b/CUETools.Codecs.APE/CUETools.Codecs.APE.cpp
index 3c7734a..facee84 100644
--- a/CUETools.Codecs.APE/CUETools.Codecs.APE.cpp
+++ b/CUETools.Codecs.APE/CUETools.Codecs.APE.cpp
@@ -119,7 +119,6 @@ namespace CUETools { namespace Codecs { namespace APE {
 		}
 	};
 
-	[AudioDecoderClass(DecoderSettings::typeid)]
 	public ref class AudioDecoder : public IAudioSource
 	{
 	public:
@@ -323,7 +322,6 @@ namespace CUETools { namespace Codecs { namespace APE {
 		}		
 	};
 
-	[AudioEncoderClass(EncoderSettings::typeid)]
 	public ref class AudioEncoder : IAudioDest
 	{
 	public:
diff --git a/CUETools.Codecs.TTA/CUETools.Codecs.TTA.cpp b/CUETools.Codecs.TTA/CUETools.Codecs.TTA.cpp
index 3f28f49..12b69c2 100644
--- a/CUETools.Codecs.TTA/CUETools.Codecs.TTA.cpp
+++ b/CUETools.Codecs.TTA/CUETools.Codecs.TTA.cpp
@@ -58,7 +58,6 @@ namespace TTA {
 		}
 	};
 
-	[AudioDecoderClass(DecoderSettings::typeid)]
 	public ref class AudioDecoder : public IAudioSource
 	{
 	public:
@@ -279,7 +278,6 @@ namespace TTA {
 		}
 	};
 
-	[AudioEncoderClass(EncoderSettings::typeid)]
 	public ref class AudioEncoder : public IAudioDest
 	{
 	public:
diff --git a/ThirdParty/WavPack b/ThirdParty/WavPack
index c2d60b1..9b59bcd 160000
--- a/ThirdParty/WavPack
+++ b/ThirdParty/WavPack
@@ -1 +1 @@
-Subproject commit c2d60b18d7247dc6739e7e2d55947dbb836d3172
+Subproject commit 9b59bcd6ed875e3e2e5b0e93536c097838181d1c
diff --git a/ThirdParty/flac b/ThirdParty/flac
index 6735ddd..8f4f296 160000
--- a/ThirdParty/flac
+++ b/ThirdParty/flac
@@ -1 +1 @@
-Subproject commit 6735ddd4602e6a4588ade4d363e750ae8fa1ab7d
+Subproject commit 8f4f296372384d3622d230247c370329662ca1a5