diff --git a/lib/compass/frameworks.rb b/lib/compass/frameworks.rb
index d856bcfe..b818b715 100644
--- a/lib/compass/frameworks.rb
+++ b/lib/compass/frameworks.rb
@@ -28,7 +28,7 @@ module Compass
     end
 
     def register(name, *arguments)
-      if idx = ALL.index{|f| f.name.to_s == name.to_s}
+      if idx = ALL.index(self[name])
         ALL[idx] = Framework.new(name, *arguments)
       else
         ALL << Framework.new(name, *arguments)
diff --git a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_form.sass b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_form.sass
index 1ff6c040..82d86d34 100644
--- a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_form.sass
+++ b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_form.sass
@@ -21,7 +21,7 @@
     font-weight: bold
     font-size: 1.2em
   input
-    &.text, &.title, &[type=text]
+    &.text, &.title, &[type=text], &[type=password]
       margin: 0.5em 0
       background-color: #fff
       padding: 5px
@@ -38,8 +38,9 @@
     margin: 0.5em 0
 
 =blueprint-form-sizes(!input_width = 300px, !textarea_width = 390px, !textarea_height = 250px)
-  input.text, input.title
-    width= !input_width
+  input
+    &.text, &.title, &[type=text], &[type=password]
+      width= !input_width
   textarea
     width= !textarea_width
     height= !textarea_height
@@ -47,7 +48,7 @@
 =blueprint-form-borders(!unfocused_border_color = #bbb, !focus_border_color = #666, !fieldset_border_color = #ccc)
   fieldset
     border= 1px "solid" !fieldset_border_color
-  input.text, input.title,
+  input.text, input.title, input[type=text], input[type=password],
   textarea,
   select
     border= 1px "solid" !unfocused_border_color
diff --git a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_grid.sass b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_grid.sass
index 3edd3897..76759a99 100644
--- a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_grid.sass
+++ b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_grid.sass
@@ -176,3 +176,4 @@
   +colruler
   background: #fff
   color: #fff
+  visibility: hidden
diff --git a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_ie.sass b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_ie.sass
index 5f732316..44d9f5e7 100644
--- a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_ie.sass
+++ b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_ie.sass
@@ -56,8 +56,6 @@
 =blueprint-ie-defaults
   .container
     text-align: left
-  ol
-    margin-left: 2em
   sup
     vertical-align: text-top
   sub
@@ -68,6 +66,8 @@
     -ms-interpolation-mode: bicubic
   fieldset
     padding-top: 0
+  textarea
+    overflow: auto
   input
     &.text
       margin: 0.5em 0
diff --git a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_print.sass b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_print.sass
index 4ed82b27..25424725 100644
--- a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_print.sass
+++ b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_print.sass
@@ -62,9 +62,6 @@
     font:
       size: .9em
       family= !blueprint_fixed_font_family
-  img
-    +float-left
-    margin: 1.5em 1.5em 1.5em 0
   a
     img
       border: none
diff --git a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_reset.sass b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_reset.sass
index 2045a794..a821fb48 100644
--- a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_reset.sass
+++ b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_reset.sass
@@ -3,6 +3,8 @@
 =blueprint-global-reset
   html, body
     +blueprint-reset
+  html
+    font-size: 100.01%
   +blueprint-nested-reset
 
 // Reset all elements within some selector scope.To reset the selector itself,
diff --git a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_rtl.sass b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_rtl.sass
index 616b92f0..eab6ccc1 100644
--- a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_rtl.sass
+++ b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_rtl.sass
@@ -29,6 +29,7 @@
     +last
   @else
     margin-left= !blueprint_grid_margin
+  text-align: right
   * html &
     overflow-x: hidden
 
diff --git a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_typography.sass b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_typography.sass
index 6f230bfb..a244087a 100644
--- a/lib/compass/frameworks/blueprint/stylesheets/blueprint/_typography.sass
+++ b/lib/compass/frameworks/blueprint/stylesheets/blueprint/_typography.sass
@@ -125,13 +125,15 @@
     white-space: pre
   pre, code, tt
     +fixed-width-text
-  li ul,  li ol
-    margin: 0 1.5em
+  li
+    ul, ol
+      margin: 0
+  ul, ol
+    margin: 0 1.5em 1.5em 0
+    padding-left: 3.333em
   ul
-    margin: 0 1.5em 1.5em 1.5em
     list-style-type: disc
   ol
-    margin: 0 1.5em 1.5em 1.5em
     list-style-type: decimal
   dl
     margin: 0 0 1.5em 0
diff --git a/lib/compass/grid_builder.rb b/lib/compass/grid_builder.rb
index 2b5c5d34..e81d1f6e 100644
--- a/lib/compass/grid_builder.rb
+++ b/lib/compass/grid_builder.rb
@@ -48,7 +48,7 @@ module Compass
         canvas.background_fill = 'white'
 
         canvas.g do |column|
-          column.rect(self.column_width, @height).styles(:fill => "#e8effb")
+          column.rect(self.column_width - 1, @height).styles(:fill => "#e8effb")
         end
 
         canvas.g do |baseline|
diff --git a/test/compass_test.rb b/test/compass_test.rb
index 4d570fed..7dff4904 100644
--- a/test/compass_test.rb
+++ b/test/compass_test.rb
@@ -77,7 +77,7 @@ private
       actual_result_file = "#{tempfile_path(@current_project)}/#{name}.css"
       expected_result_file = "#{result_path(@current_project)}/#{name}.css"
       actual_lines = File.read(actual_result_file).split("\n")
-      expected_lines = File.read(expected_result_file).split("\n")
+      expected_lines = ERB.new(File.read(expected_result_file)).result(binding).split("\n")
       expected_lines.zip(actual_lines).each_with_index do |pair, line|
         message = "template: #{name}\nline:     #{line + 1}"
         assert_equal(pair.first, pair.last, message)
diff --git a/test/fixtures/stylesheets/blueprint/css/typography.css b/test/fixtures/stylesheets/blueprint/css/typography.css
index 53f7e26b..ab85ffc5 100644
--- a/test/fixtures/stylesheets/blueprint/css/typography.css
+++ b/test/fixtures/stylesheets/blueprint/css/typography.css
@@ -111,14 +111,16 @@ pre, code, tt {
   line-height: 1.5; }
 
 li ul, li ol {
-  margin: 0 1.5em; }
+  margin: 0; }
+
+ul, ol {
+  margin: 0 1.5em 1.5em 0;
+  padding-left: 3.333em; }
 
 ul {
-  margin: 0 1.5em 1.5em 1.5em;
   list-style-type: disc; }
 
 ol {
-  margin: 0 1.5em 1.5em 1.5em;
   list-style-type: decimal; }
 
 dl {
diff --git a/test/fixtures/stylesheets/relative/css/screen.css b/test/fixtures/stylesheets/relative/css/screen.css
index 126d8932..a076f52a 100644
--- a/test/fixtures/stylesheets/relative/css/screen.css
+++ b/test/fixtures/stylesheets/relative/css/screen.css
@@ -1 +1 @@
-test { background: url('../assets/images/testing.png?1258702388'); }
+test { background: url('../assets/images/testing.png?<%= File.mtime(File.join(Compass.configuration.project_path, 'assets', 'images', 'testing.png')).strftime("%s") %>'); }