Rakefile tweakings