2 files changed, 3 insertions, 2 deletions
diff --git a/lib/coderay/encoder.rb b/lib/coderay/encoder.rb
index 8e67172..e543c8c 100644
--- a/lib/coderay/encoder.rb
+++ b/lib/coderay/encoder.rb
@@ -168,7 +168,8 @@ module CodeRay
       # The already created +tokens+ object must be used; it can be a
       # TokenStream or a Tokens object.
       def compile tokens, options
-        tokens.each(&self)
+        tokens.each { |text, kind| token text, kind }  # FIXME for Ruby 1.9?
+        #tokens.each(&self)
       end
 
     end
diff --git a/lib/coderay/encoders/html.rb b/lib/coderay/encoders/html.rb
index 0c66f68..4981585 100644
--- a/lib/coderay/encoders/html.rb
+++ b/lib/coderay/encoders/html.rb
@@ -158,7 +158,7 @@ module Encoders
 
       when :class
         @css_style = Hash.new do |h, k|
-          c = Tokens::ClassOfKind[k.first]
+          c = CodeRay::Tokens::ClassOfKind[k.first]
           if c == :NO_HIGHLIGHT and not hint
             h[k.dup] = false
           else