Final modifications on queue_item.rb etc