Rakefile adjustments