diff --git a/README.md b/README.md
index a9901c3..d54d8e3 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ use encoding::all::ASCII;
 // hexadecimal numeric character reference replacement
 fn hex_ncr_escape(_encoder: &mut Encoder, input: &str, output: &mut ByteWriter) -> bool {
     let escapes: Vec<String> =
-        input.chars().map(|ch| format!("&\\#x{:x};", ch as int)).collect();
+        input.chars().map(|ch| format!("&#x{:x};", ch as int)).collect();
     let escapes = escapes.concat();
     output.write_bytes(escapes.as_bytes());
     true
diff --git a/src/encoding/codec/japanese.rs b/src/encoding/codec/japanese.rs
index 81d3535..42a6e9c 100644
--- a/src/encoding/codec/japanese.rs
+++ b/src/encoding/codec/japanese.rs
@@ -486,7 +486,7 @@ impl Encoding for ISO2022JPEncoding {
     fn decoder(&self) -> Box<Decoder> { ISO2022JPDecoder::new() }
 }
 
-#[deriving(Eq,Clone)]
+#[deriving(PartialEq,Clone)]
 enum ISO2022JPState {
     ASCII, // U+0000..007F, U+00A5, U+203E
     Katakana, // JIS X 0201: U+FF61..FF9F
diff --git a/src/encoding/lib.rs b/src/encoding/lib.rs
index ffaffb4..631c41a 100644
--- a/src/encoding/lib.rs
+++ b/src/encoding/lib.rs
@@ -69,7 +69,7 @@ use encoding::all::ASCII;
 // hexadecimal numeric character reference replacement
 fn hex_ncr_escape(_encoder: &mut Encoder, input: &str, output: &mut ByteWriter) -> bool {
     let escapes: Vec<String> =
-        input.chars().map(|ch| format!("&\\#x{:x};", ch as int)).collect();
+        input.chars().map(|ch| format!("&#x{:x};", ch as int)).collect();
     let escapes = escapes.concat();
     output.write_bytes(escapes.as_bytes());
     true
diff --git a/src/encoding/types.rs b/src/encoding/types.rs
index bd8efaa..26dc141 100644
--- a/src/encoding/types.rs
+++ b/src/encoding/types.rs
@@ -245,7 +245,7 @@ pub trait Decoder {
 /// A trait object using dynamic dispatch which is a sendable reference to the encoding,
 /// for code where the encoding is not known at compile-time.
 #[stable]
-pub type EncodingRef = &'static Encoding: Send;
+pub type EncodingRef = &'static Encoding+Send;
 
 /// Character encoding.
 #[stable]
@@ -437,7 +437,7 @@ impl EncoderTrap {
             EncodeNcrEscape => {
                 let mut escapes = String::new();
                 for ch in input.chars() {
-                    escapes.push_str(format!("&\\#{:d};", ch as int).as_slice());
+                    escapes.push_str(format!("&#{:d};", ch as int).as_slice());
                 }
                 reencode(encoder, escapes.as_slice(), output, "NcrEscape")
             },
diff --git a/src/encoding/util.rs b/src/encoding/util.rs
index a64eaa4..321ac1b 100644
--- a/src/encoding/util.rs
+++ b/src/encoding/util.rs
@@ -141,8 +141,9 @@ macro_rules! stateful_decoder(
             st: $stmod::State
         }
 
+        #[allow(non_snake_case_functions)]
         mod $stmod {
-            #[deriving(Eq,Clone)]
+            #[deriving(PartialEq,Clone)]
             pub enum State {
                 $inist,
                 $(