Rakefile improvements