Some more edits to the Rakefile