diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index c047ceff1..c190e5ccf 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -774,6 +774,8 @@ form p.checkbox_select
     input[type='file']
       :top initial !important
       :right initial !important
+      :height 100%
+      :width 100%
 
     img
       @include opacity(0.4)
diff --git a/spec/controllers/conversations_controller_spec.rb b/spec/controllers/conversations_controller_spec.rb
index 50c1ceaa4..a84958672 100644
--- a/spec/controllers/conversations_controller_spec.rb
+++ b/spec/controllers/conversations_controller_spec.rb
@@ -47,13 +47,13 @@ describe ConversationsController do
     it 'succeeds' do
       get :index
       response.should be_success
-      assigns[:conversations].should == @conversations
+      assigns[:conversations].should =~ @conversations
     end
     
     it 'succeeds with json' do
       get :index, :format => :json
       response.should be_success
-      response.body.should == @conversations.to_json
+      response.body.should =~ @conversations.to_json
     end
     
     it 'retrieves all conversations for a user' do
diff --git a/spec/lib/template_picker_spec.rb b/spec/lib/template_picker_spec.rb
index 0ef0adabb..be75fb455 100644
--- a/spec/lib/template_picker_spec.rb
+++ b/spec/lib/template_picker_spec.rb
@@ -73,7 +73,7 @@ describe TemplatePicker do
     TemplatePicker::TEMPLATES.each do |template|
       describe "#{template} factory" do
         it 'works' do
-          post = Factory(template.to_sym, :author => alice.person).reload
+          post = Factory.build(template.to_sym, :author => alice.person)
           template_name = TemplatePicker.new(post).template_name.gsub('-', '_')
           template_name.should == template
         end