Minor Rakefile improvements