More Rakefile tweaks