Further rakefile edits