Misc Rakefile edits