Fixes for Rakefile and Spree 2.