More Rakefile fixes