diff --git a/app/models/block.rb b/app/models/block.rb
index 2803d54..f632a8e 100644
--- a/app/models/block.rb
+++ b/app/models/block.rb
@@ -1,6 +1,6 @@
 class Block < ActiveRecord::Base
 
-  attr_accessible :title
+  attr_accessible :title, :display
 
   # to be able to generate HTML
   include ActionView::Helpers::UrlHelper
diff --git a/app/models/highlights_block.rb b/app/models/highlights_block.rb
index 80e6ceb..1ebeb9a 100644
--- a/app/models/highlights_block.rb
+++ b/app/models/highlights_block.rb
@@ -1,5 +1,7 @@
 class HighlightsBlock < Block
 
+  attr_accessible :images
+
   settings_items :images, :type => Array, :default => []
   settings_items :interval, :type => 'integer', :default => 4
   settings_items :shuffle, :type => 'boolean', :default => false
@@ -30,7 +32,7 @@ class HighlightsBlock < Block
 
   def content(args={})
     block = self
-    lambda do
+    proc do
       render :file => 'blocks/highlights', :locals => { :block => block }
     end
   end
diff --git a/app/models/link_list_block.rb b/app/models/link_list_block.rb
index 55f9d6a..35c412e 100644
--- a/app/models/link_list_block.rb
+++ b/app/models/link_list_block.rb
@@ -1,6 +1,6 @@
 class LinkListBlock < Block
 
-  attr_accessible :links, :display
+  attr_accessible :links
 
   ICONS = [
     ['no-icon', _('(No icon)')],
diff --git a/test/unit/highlights_block_test.rb b/test/unit/highlights_block_test.rb
index 966b3b5..ba4a9ec 100644
--- a/test/unit/highlights_block_test.rb
+++ b/test/unit/highlights_block_test.rb
@@ -60,7 +60,9 @@ class HighlightsBlockTest < ActiveSupport::TestCase
   should 'be able to update display setting' do
     user = create_user('testinguser').person
     box = fast_create(Box, :owner_id => user.id)
-    block = HighlightsBlock.create!(:display => 'never', :box => box)
+    block = HighlightsBlock.create!(:display => 'never').tap do |b|
+      b.box = box
+    end
     assert block.update_attributes!(:display => 'always')
     block.reload
     assert_equal 'always', block.display
@@ -143,7 +145,7 @@ class HighlightsBlockTest < ActiveSupport::TestCase
       block = HighlightsBlock.new
       block.stubs(:owner).returns(owner)
 
-      assert_kind_of Array, block.folder_choices
+      assert_equal [], block.folder_choices
     end
   end
 
--
libgit2 0.21.2