Fix up Rakefile some